From 609ee3db2b7185340d1494bbaecd74a87858b361 Mon Sep 17 00:00:00 2001 From: martell Date: Sat, 25 Jan 2014 20:38:15 +0000 Subject: [PATCH 01/23] Added Dutch for 3.x branch --- cocos/2d/platform/CCCommon.h | 1 + cocos/2d/platform/android/CCApplication.cpp | 4 ++++ cocos/2d/platform/ios/CCApplication.mm | 3 +++ cocos/2d/platform/linux/CCApplication.cpp | 4 ++++ cocos/2d/platform/mac/CCApplication.mm | 3 +++ cocos/2d/platform/win32/CCApplication.cpp | 3 +++ 6 files changed, 18 insertions(+) diff --git a/cocos/2d/platform/CCCommon.h b/cocos/2d/platform/CCCommon.h index fa300cd4fe..fcd28b4997 100644 --- a/cocos/2d/platform/CCCommon.h +++ b/cocos/2d/platform/CCCommon.h @@ -56,6 +56,7 @@ enum class LanguageType ITALIAN, GERMAN, SPANISH, + DUTCH, RUSSIAN, KOREAN, JAPANESE, diff --git a/cocos/2d/platform/android/CCApplication.cpp b/cocos/2d/platform/android/CCApplication.cpp index 3c5b3191b3..e65f47099c 100644 --- a/cocos/2d/platform/android/CCApplication.cpp +++ b/cocos/2d/platform/android/CCApplication.cpp @@ -116,6 +116,10 @@ LanguageType Application::getCurrentLanguage() { ret = LanguageType::RUSSIAN; } + else if (0 == strcmp("nl", pLanguageName)) + { + ret = LanguageType::DUTCH; + } else if (0 == strcmp("ko", pLanguageName)) { ret = LanguageType::KOREAN; diff --git a/cocos/2d/platform/ios/CCApplication.mm b/cocos/2d/platform/ios/CCApplication.mm index 14b07975ca..28f4f969d4 100644 --- a/cocos/2d/platform/ios/CCApplication.mm +++ b/cocos/2d/platform/ios/CCApplication.mm @@ -108,6 +108,9 @@ LanguageType Application::getCurrentLanguage() else if ([languageCode isEqualToString:@"es"]){ ret = LanguageType::SPANISH; } + else if ([languageCode isEqualToString:@"nl"]){ + ret = LanguageType::DUTCH; + } else if ([languageCode isEqualToString:@"ru"]){ ret = LanguageType::RUSSIAN; } diff --git a/cocos/2d/platform/linux/CCApplication.cpp b/cocos/2d/platform/linux/CCApplication.cpp index f2efa5b7de..7e7b4fa381 100644 --- a/cocos/2d/platform/linux/CCApplication.cpp +++ b/cocos/2d/platform/linux/CCApplication.cpp @@ -171,6 +171,10 @@ LanguageType Application::getCurrentLanguage() { ret = LanguageType::SPANISH; } + else if (0 == strcmp("nl", pLanguageName)) + { + ret = LanguageType::DUTCH; + } else if (0 == strcmp("ru", pLanguageName)) { ret = LanguageType::RUSSIAN; diff --git a/cocos/2d/platform/mac/CCApplication.mm b/cocos/2d/platform/mac/CCApplication.mm index 0ece7367f4..6bfafbf9c9 100644 --- a/cocos/2d/platform/mac/CCApplication.mm +++ b/cocos/2d/platform/mac/CCApplication.mm @@ -130,6 +130,9 @@ LanguageType Application::getCurrentLanguage() else if ([languageCode isEqualToString:@"es"]){ ret = LanguageType::SPANISH; } + else if ([languageCode isEqualToString:@"nl"]){ + ret = LanguageType::DUTCH; + } else if ([languageCode isEqualToString:@"ru"]){ ret = LanguageType::RUSSIAN; } diff --git a/cocos/2d/platform/win32/CCApplication.cpp b/cocos/2d/platform/win32/CCApplication.cpp index 85fe2a4a4e..1e7460b5b2 100644 --- a/cocos/2d/platform/win32/CCApplication.cpp +++ b/cocos/2d/platform/win32/CCApplication.cpp @@ -148,6 +148,9 @@ LanguageType Application::getCurrentLanguage() case LANG_SPANISH: ret = LanguageType::SPANISH; break; + case LANG_DUTCH: + ret = LanguageType::DUTCH; + break; case LANG_RUSSIAN: ret = LanguageType::RUSSIAN; break; From 2f02e2e39097c2912fa1706c8d39751ac5e76c56 Mon Sep 17 00:00:00 2001 From: James Chen Date: Tue, 28 Jan 2014 10:40:47 +0800 Subject: [PATCH 02/23] issue #3828: Removes some samples(HelloCpp, HelloLua, JSB games), moves test case samples(TestCpp, TestJavascript, TestLua) to previous folder (cocos2d-x/samples). --- .../AssetsManagerTest/Classes/AppDelegate.cpp | 221 --- .../AssetsManagerTest/Classes/AppDelegate.h | 75 - samples/Cpp/AssetsManagerTest/README.md | 37 - .../Resources/Background.png.REMOVED.git-id | 1 - .../Cpp/AssetsManagerTest/Resources/main.js | 52 - .../Cpp/AssetsManagerTest/Resources/myApp.js | 99 -- .../AssetsManagerTest/proj.android/.project | 70 - .../proj.android/AndroidManifest.xml | 35 - .../AssetsManagerTest/proj.android/build.xml | 92 -- .../proj.android/jni/Android.mk | 30 - .../proj.android/jni/Application.mk | 5 - .../proj.android/jni/hellocpp/main.cpp | 14 - .../proj.android/project.properties | 15 - .../proj.android/res/values/strings.xml | 4 - .../AssetsManagerTest/Cocos2dxActivity.java | 33 - .../proj.ios/AppController.h | 20 - .../proj.ios/AppController.mm | 122 -- .../Cpp/AssetsManagerTest/proj.ios/Prefix.pch | 8 - .../proj.ios/RootViewController.h | 16 - .../proj.ios/RootViewController.mm | 79 - .../AssetsManagerTest/proj.ios/iTunesArtwork | Bin 61982 -> 0 bytes samples/Cpp/AssetsManagerTest/proj.ios/main.m | 17 - .../proj.win32/AssetsManagerTest.vcxproj | 217 --- .../AssetsManagerTest.vcxproj.filters | 44 - .../proj.win32/AssetsManagerTest.vcxproj.user | 11 - .../Cpp/AssetsManagerTest/proj.win32/main.cpp | 37 - .../Cpp/AssetsManagerTest/proj.win32/res.rc | 86 - .../AssetsManagerTest/proj.win32/res/res.ico | Bin 47629 -> 0 bytes samples/Cpp/HelloCpp/CMakeLists.txt | 75 - samples/Cpp/HelloCpp/Classes/AppDelegate.cpp | 93 -- samples/Cpp/HelloCpp/Classes/AppMacros.h | 56 - .../Cpp/HelloCpp/Classes/HelloWorldScene.cpp | 88 - .../Cpp/HelloCpp/Classes/HelloWorldScene.h | 22 - .../ipad/HelloWorld.png.REMOVED.git-id | 1 - .../ipadhd/HelloWorld.png.REMOVED.git-id | 1 - .../iphone/HelloWorld.png.REMOVED.git-id | 1 - samples/Cpp/HelloCpp/proj.android/.project | 60 - .../HelloCpp/proj.android/AndroidManifest.xml | 34 - samples/Cpp/HelloCpp/proj.android/build.xml | 85 - .../Cpp/HelloCpp/proj.android/jni/Android.mk | 20 - .../HelloCpp/proj.android/jni/Application.mk | 5 - .../proj.android/jni/hellocpp/main.cpp | 16 - samples/Cpp/HelloCpp/proj.android/jni/list.sh | 23 - samples/Cpp/HelloCpp/proj.android/ndkgdb.sh | 47 - .../proj.android/res/values/strings.xml | 4 - .../cocos2dx/hellocpp/Cocos2dxActivity.java | 32 - .../Cpp/HelloCpp/proj.ios/AppController.mm | 134 -- .../Cpp/HelloCpp/proj.ios/HelloCpp_Prefix.pch | 8 - .../HelloCpp/proj.ios/RootViewController.mm | 97 -- samples/Cpp/HelloCpp/proj.ios/main.m | 17 - samples/Cpp/HelloCpp/proj.linux/main.cpp | 18 - .../Cpp/HelloCpp/proj.mac/HelloCpp_Prefix.pch | 7 - samples/Cpp/HelloCpp/proj.mac/main.cpp | 36 - .../Cpp/HelloCpp/proj.win32/HelloCpp.vcxproj | 147 -- .../proj.win32/HelloCpp.vcxproj.filters | 38 - .../HelloCpp/proj.win32/HelloCpp.vcxproj.user | 11 - samples/Cpp/HelloCpp/proj.win32/main.cpp | 20 - .../Cpp/SimpleGame/Classes/AppDelegate.cpp | 70 - samples/Cpp/SimpleGame/Classes/AppDelegate.h | 38 - .../Cpp/SimpleGame/Classes/GameOverScene.cpp | 93 -- .../Cpp/SimpleGame/Classes/GameOverScene.h | 55 - .../SimpleGame/Classes/HelloWorldScene.cpp | 316 ---- .../Cpp/SimpleGame/Classes/HelloWorldScene.h | 46 - samples/Cpp/SimpleGame/Resources/.gitignore | 2 - .../Cpp/SimpleGame/Resources/app.config.txt | 10 - .../Cpp/SimpleGame/proj.android/.classpath | 9 - samples/Cpp/SimpleGame/proj.android/.project | 65 - .../org.eclipse.cdt.codan.core.prefs | 68 - .../proj.android/AndroidManifest.xml | 35 - samples/Cpp/SimpleGame/proj.android/README.md | 87 - samples/Cpp/SimpleGame/proj.android/build.xml | 92 -- .../SimpleGame/proj.android/jni/Android.mk | 21 - .../proj.android/jni/Application.mk | 5 - .../proj.android/jni/hellocpp/main.cpp | 16 - .../Cpp/SimpleGame/proj.android/jni/list.sh | 23 - samples/Cpp/SimpleGame/proj.android/ndkgdb.sh | 62 - .../proj.android/project.properties | 15 - .../proj.android/res/values/strings.xml | 4 - samples/Cpp/SimpleGame/proj.android/run.sh | 1 - .../cocos2dx/simplegame/Cocos2dxActivity.java | 33 - .../Cpp/SimpleGame/proj.ios/AppController.h | 33 - .../Cpp/SimpleGame/proj.ios/AppController.mm | 134 -- .../SimpleGame/proj.ios/SimpleGame_Prefix.pch | 8 - samples/Cpp/SimpleGame/proj.ios/main.m | 17 - samples/Cpp/SimpleGame/proj.linux/main.cpp | 18 - .../SimpleGame/proj.mac/SampleGame_Prefix.pch | 7 - .../SimpleGame/proj.mac/en.lproj/MainMenu.xib | 812 --------- samples/Cpp/SimpleGame/proj.mac/main.cpp | 36 - .../SimpleGame/proj.win32/SimpleGame.vcxproj | 151 -- .../proj.win32/SimpleGame.vcxproj.filters | 41 - .../proj.win32/SimpleGame.vcxproj.user | 11 - samples/Cpp/SimpleGame/proj.win32/main.cpp | 20 - samples/Cpp/SimpleGame/proj.win32/main.h | 13 - samples/Cpp/TestCpp/Classes/AppDelegate.h | 38 - samples/Cpp/TestCpp/Resources/.gitignore | 2 - .../background-music-aac.wav.REMOVED.git-id | 1 - samples/Cpp/TestCpp/proj.android/.classpath | 9 - .../org.eclipse.cdt.codan.core.prefs | 68 - samples/Cpp/TestCpp/proj.android/README.md | 87 - .../Cpp/TestCpp/proj.android/ant.properties | 17 - samples/Cpp/TestCpp/proj.win32/main.h | 13 - .../CocosDragonJS/Classes/AppDelegate.cpp | 162 -- .../CocosDragonJS/proj.android/.project | 70 - .../org.eclipse.cdt.codan.core.prefs | 68 - .../proj.android/AndroidManifest.xml | 34 - .../CocosDragonJS/proj.android/README.md | 87 - .../CocosDragonJS/proj.android/build.xml | 92 -- .../CocosDragonJS/proj.android/jni/Android.mk | 31 - .../proj.android/jni/Application.mk | 6 - .../CocosDragonJS/proj.android/ndkgdb.sh | 47 - .../proj.android/proguard-project.txt | 20 - .../proj.android/res/values/strings.xml | 4 - .../cocosdragonjs/Cocos2dxActivity.java | 33 - .../CocosDragonJS/proj.ios/AppController.mm | 119 -- .../Default-568h@2x.png.REMOVED.git-id | 1 - .../proj.ios/Default@2x.png.REMOVED.git-id | 1 - .../proj.ios/RootViewController.h | 33 - .../proj.mac/Icon.icns.REMOVED.git-id | 1 - .../proj.mac/en.lproj/InfoPlist.strings | 2 - .../CocosDragonJS/proj.mac/main.cpp | 36 - .../proj.win32/CocosDragonJS.vcxproj | 228 --- .../proj.win32/CocosDragonJS.vcxproj.filters | 44 - .../proj.win32/CocosDragonJS.vcxproj.user | 11 - .../CocosDragonJS/proj.win32/main.cpp | 37 - .../CocosDragonJS/proj.win32/main.h | 12 - .../CocosDragonJS/proj.win32/resource.h | 20 - .../CrystalCraze/Classes/AppDelegate.cpp | 143 -- .../CrystalCraze/Classes/AppDelegate.h | 45 - .../CrystalCraze/proj.android/.classpath | 9 - .../CrystalCraze/proj.android/.project | 70 - .../org.eclipse.cdt.codan.core.prefs | 68 - .../proj.android/AndroidManifest.xml | 34 - .../CrystalCraze/proj.android/README.md | 87 - .../CrystalCraze/proj.android/ant.properties | 1 - .../CrystalCraze/proj.android/build.xml | 92 -- .../CrystalCraze/proj.android/jni/Android.mk | 30 - .../proj.android/jni/Application.mk | 6 - .../proj.android/jni/crystalcraze/main.cpp | 16 - .../CrystalCraze/proj.android/ndkgdb.sh | 47 - .../proj.android/proguard-project.txt | 20 - .../proj.android/project.properties | 13 - .../proj.android/res/values/strings.xml | 4 - .../crystalcraze/Cocos2dxActivity.java | 33 - .../CrystalCraze/proj.ios/AppController.h | 17 - .../CrystalCraze/proj.ios/AppController.mm | 119 -- .../Default-568h@2x.png.REMOVED.git-id | 1 - .../proj.ios/Default@2x.png.REMOVED.git-id | 1 - .../CrystalCraze/proj.ios/Prefix.pch | 8 - .../proj.ios/RootViewController.h | 33 - .../proj.ios/RootViewController.mm | 79 - .../Javascript/CrystalCraze/proj.ios/main.m | 17 - .../proj.mac/Icon.icns.REMOVED.git-id | 1 - .../proj.mac/en.lproj/InfoPlist.strings | 2 - .../proj.mac/en.lproj/MainMenu.xib | 812 --------- .../Javascript/CrystalCraze/proj.mac/main.cpp | 36 - .../proj.win32/CrystalCraze.vcxproj | 234 --- .../proj.win32/CrystalCraze.vcxproj.filters | 44 - .../proj.win32/CrystalCraze.vcxproj.user | 11 - .../CrystalCraze/proj.win32/main.cpp | 37 - .../Javascript/CrystalCraze/proj.win32/main.h | 12 - .../CrystalCraze/proj.win32/res/testjs.ico | Bin 47629 -> 0 bytes .../CrystalCraze/proj.win32/resource.h | 20 - .../CrystalCraze/proj.win32/testjs.rc | 86 - .../MoonWarriors/Classes/AppDelegate.cpp | 85 - .../MoonWarriors/Classes/AppDelegate.h | 45 - .../MoonWarriors/proj.android/.classpath | 9 - .../MoonWarriors/proj.android/.project | 70 - .../org.eclipse.cdt.codan.core.prefs | 68 - .../proj.android/AndroidManifest.xml | 34 - .../MoonWarriors/proj.android/README.md | 87 - .../MoonWarriors/proj.android/ant.properties | 1 - .../MoonWarriors/proj.android/build.xml | 92 -- .../MoonWarriors/proj.android/jni/Android.mk | 30 - .../proj.android/jni/moonwarriors/main.cpp | 16 - .../proj.android/proguard-project.txt | 20 - .../proj.android/project.properties | 13 - .../proj.android/res/values/strings.xml | 4 - .../moonwarriors/Cocos2dxActivity.java | 33 - .../MoonWarriors/proj.ios/AppController.h | 17 - .../MoonWarriors/proj.ios/AppController.mm | 119 -- .../Default-568h@2x.png.REMOVED.git-id | 1 - .../proj.ios/Default@2x.png.REMOVED.git-id | 1 - .../MoonWarriors/proj.ios/Prefix.pch | 8 - .../proj.ios/RootViewController.h | 33 - .../proj.ios/RootViewController.mm | 79 - .../Javascript/MoonWarriors/proj.ios/main.m | 17 - .../proj.mac/Icon.icns.REMOVED.git-id | 1 - .../proj.mac/en.lproj/InfoPlist.strings | 2 - .../proj.mac/en.lproj/MainMenu.xib | 812 --------- .../Javascript/MoonWarriors/proj.mac/main.cpp | 37 - .../proj.win32/MoonWarriors.vcxproj | 235 --- .../proj.win32/MoonWarriors.vcxproj.filters | 44 - .../proj.win32/MoonWarriors.vcxproj.user | 11 - .../MoonWarriors/proj.win32/main.cpp | 37 - .../Javascript/MoonWarriors/proj.win32/main.h | 12 - .../MoonWarriors/proj.win32/res/testjs.ico | Bin 47629 -> 0 bytes .../MoonWarriors/proj.win32/resource.h | 20 - .../MoonWarriors/proj.win32/testjs.rc | 86 - .../TestJavascript/Classes/AppDelegate.h | 45 - .../TestJavascript/proj.android/.classpath | 9 - .../org.eclipse.cdt.codan.core.prefs | 68 - .../TestJavascript/proj.android/README.md | 87 - .../proj.android/ant.properties | 1 - .../proj.android/jni/Application.mk | 5 - .../proj.android/jni/testjavascript/main.cpp | 16 - .../proj.android/proguard-project.txt | 20 - .../proj.android/project.properties | 13 - .../TestJavascript/proj.ios/AppController.h | 17 - .../Default-568h@2x.png.REMOVED.git-id | 1 - .../proj.ios/Default@2x.png.REMOVED.git-id | 1 - .../TestJavascript/proj.ios/Prefix.pch | 8 - .../proj.ios/RootViewController.h | 33 - .../proj.ios/RootViewController.mm | 79 - .../Javascript/TestJavascript/proj.ios/main.m | 17 - .../proj.mac/Icon.icns.REMOVED.git-id | 1 - .../proj.mac/en.lproj/InfoPlist.strings | 2 - .../proj.mac/en.lproj/MainMenu.xib | 812 --------- .../TestJavascript/proj.win32/main.h | 12 - .../TestJavascript/proj.win32/res/testjs.ico | Bin 47629 -> 0 bytes .../TestJavascript/proj.win32/resource.h | 20 - .../TestJavascript/proj.win32/testjs.rc | 86 - .../WatermelonWithMe/Classes/AppDelegate.cpp | 82 - .../WatermelonWithMe/Classes/AppDelegate.h | 45 - .../WatermelonWithMe/proj.android/.classpath | 9 - .../WatermelonWithMe/proj.android/.project | 70 - .../org.eclipse.cdt.codan.core.prefs | 68 - .../proj.android/AndroidManifest.xml | 34 - .../WatermelonWithMe/proj.android/README.md | 87 - .../proj.android/ant.properties | 1 - .../WatermelonWithMe/proj.android/build.xml | 92 -- .../proj.android/jni/Android.mk | 30 - .../proj.android/jni/Application.mk | 5 - .../jni/watermelonwithme/main.cpp | 16 - .../WatermelonWithMe/proj.android/ndkgdb.sh | 47 - .../proj.android/proguard-project.txt | 20 - .../proj.android/project.properties | 13 - .../proj.android/res/values/strings.xml | 4 - .../watermelonwithme/Cocos2dxActivity.java | 33 - .../WatermelonWithMe/proj.ios/AppController.h | 17 - .../proj.ios/AppController.mm | 119 -- .../Default-568h@2x.png.REMOVED.git-id | 1 - .../proj.ios/Default@2x.png.REMOVED.git-id | 1 - .../WatermelonWithMe/proj.ios/Prefix.pch | 8 - .../proj.ios/RootViewController.h | 33 - .../proj.ios/RootViewController.mm | 79 - .../WatermelonWithMe/proj.ios/main.m | 17 - .../proj.mac/Icon.icns.REMOVED.git-id | 1 - .../proj.mac/en.lproj/InfoPlist.strings | 2 - .../proj.mac/en.lproj/MainMenu.xib | 812 --------- .../WatermelonWithMe/proj.mac/main.cpp | 37 - .../proj.win32/WatermelonWithMe.vcxproj | 237 --- .../WatermelonWithMe.vcxproj.filters | 44 - .../proj.win32/WatermelonWithMe.vcxproj.user | 11 - .../WatermelonWithMe/proj.win32/main.cpp | 37 - .../WatermelonWithMe/proj.win32/main.h | 12 - .../proj.win32/res/testjs.ico | Bin 47629 -> 0 bytes .../WatermelonWithMe/proj.win32/resource.h | 20 - .../WatermelonWithMe/proj.win32/testjs.rc | 86 - samples/Lua/HelloLua/CMakeLists.txt | 40 - samples/Lua/HelloLua/Classes/AppDelegate.cpp | 60 - samples/Lua/HelloLua/Classes/AppDelegate.h | 38 - samples/Lua/HelloLua/Resources/.gitignore | 2 - .../HelloLua/Resources/Resources/.gitignore | 2 - .../Resources/background.mp3.REMOVED.git-id | 1 - .../Resources/background.mp3.REMOVED.git-id | 1 - .../Resources/farm.jpg.REMOVED.git-id | 1 - samples/Lua/HelloLua/Resources/hello.lua | 209 --- samples/Lua/HelloLua/Resources/hello2.lua | 3 - samples/Lua/HelloLua/Resources/mobdebug.lua | 1465 ----------------- samples/Lua/HelloLua/proj.android/.classpath | 9 - .../Javah_jni_builder.launch | 11 - samples/Lua/HelloLua/proj.android/.project | 50 - .../org.eclipse.cdt.codan.core.prefs | 68 - .../HelloLua/proj.android/AndroidManifest.xml | 35 - .../Lua/HelloLua/proj.android/ant.properties | 17 - samples/Lua/HelloLua/proj.android/build.xml | 83 - .../Lua/HelloLua/proj.android/jni/Android.mk | 20 - .../HelloLua/proj.android/jni/Application.mk | 8 - .../proj.android/jni/hellolua/main.cpp | 15 - .../proj.android/proguard-project.txt | 20 - .../HelloLua/proj.android/project.properties | 13 - .../proj.android/res/values/strings.xml | 4 - .../cocos2dx/hellolua/Cocos2dxActivity.java | 33 - samples/Lua/HelloLua/proj.ios/AppController.h | 33 - .../Lua/HelloLua/proj.ios/AppController.mm | 134 -- .../Default-568h@2x.png.REMOVED.git-id | 1 - .../proj.ios/Default@2x.png.REMOVED.git-id | 1 - .../Lua/HelloLua/proj.ios/HelloLua_Prefix.pch | 8 - .../HelloLua/proj.ios/RootViewController.h | 33 - .../HelloLua/proj.ios/RootViewController.mm | 96 -- samples/Lua/HelloLua/proj.ios/main.m | 16 - samples/Lua/HelloLua/proj.linux/main.cpp | 18 - .../Lua/HelloLua/proj.mac/HelloLua_Prefix.pch | 7 - .../proj.mac/Icon.icns.REMOVED.git-id | 1 - .../proj.mac/en.lproj/InfoPlist.strings | 2 - .../HelloLua/proj.mac/en.lproj/MainMenu.xib | 812 --------- samples/Lua/HelloLua/proj.mac/main.cpp | 36 - .../Lua/HelloLua/proj.win32/HelloLua.vcxproj | 206 --- .../proj.win32/HelloLua.vcxproj.filters | 27 - .../HelloLua/proj.win32/HelloLua.vcxproj.user | 11 - samples/Lua/HelloLua/proj.win32/main.cpp | 37 - samples/Lua/HelloLua/proj.win32/main.h | 13 - samples/Lua/TestLua/proj.android/.classpath | 9 - .../Lua/TestLua/proj.android/ant.properties | 17 - .../TestLua/proj.android/proguard-project.txt | 20 - .../TestLua/proj.android/project.properties | 13 - samples/Lua/TestLua/proj.ios/AppController.h | 33 - .../Default-568h@2x.png.REMOVED.git-id | 1 - .../proj.ios/Default@2x.png.REMOVED.git-id | 1 - .../Lua/TestLua/proj.ios/RootViewController.h | 33 - .../TestLua/proj.ios/RootViewController.mm | 96 -- .../TestLua/proj.mac/Icon.icns.REMOVED.git-id | 1 - .../proj.mac/en.lproj/InfoPlist.strings | 2 - .../TestLua/proj.mac/en.lproj/MainMenu.xib | 812 --------- samples/{Cpp => }/TestCpp/.cproject | 0 .../Javah_jni_builder.launch | 0 samples/{Cpp => }/TestCpp/Android.mk | 0 samples/{Cpp => }/TestCpp/CMakeLists.txt | 0 .../AccelerometerTest/AccelerometerTest.cpp | 0 .../AccelerometerTest/AccelerometerTest.h | 0 .../ActionManagerTest/ActionManagerTest.cpp | 0 .../ActionManagerTest/ActionManagerTest.h | 0 .../ActionsEaseTest/ActionsEaseTest.cpp | 0 .../Classes/ActionsEaseTest/ActionsEaseTest.h | 0 .../ActionsProgressTest.cpp | 0 .../ActionsProgressTest/ActionsProgressTest.h | 0 .../Classes/ActionsTest/ActionsTest.cpp | 0 .../TestCpp/Classes/ActionsTest/ActionsTest.h | 0 .../{Cpp => }/TestCpp/Classes/AppDelegate.cpp | 0 .../Classes/AppDelegate.h | 0 .../{Cpp => }/TestCpp/Classes/BaseTest.cpp | 0 samples/{Cpp => }/TestCpp/Classes/BaseTest.h | 0 .../TestCpp/Classes/Box2DTest/Box2dTest.cpp | 0 .../TestCpp/Classes/Box2DTest/Box2dTest.h | 0 .../Classes/Box2DTestBed/Box2dView.cpp | 0 .../TestCpp/Classes/Box2DTestBed/Box2dView.h | 0 .../Classes/Box2DTestBed/GLES-Render.cpp | 0 .../Classes/Box2DTestBed/GLES-Render.h | 0 .../TestCpp/Classes/Box2DTestBed/Test.cpp | 0 .../TestCpp/Classes/Box2DTestBed/Test.h | 0 .../Classes/Box2DTestBed/TestEntries.cpp | 0 .../Classes/Box2DTestBed/Tests/AddPair.h | 0 .../Classes/Box2DTestBed/Tests/ApplyForce.h | 0 .../Classes/Box2DTestBed/Tests/BodyTypes.h | 0 .../Classes/Box2DTestBed/Tests/Breakable.h | 0 .../Classes/Box2DTestBed/Tests/Bridge.h | 0 .../Classes/Box2DTestBed/Tests/BulletTest.h | 0 .../Classes/Box2DTestBed/Tests/Cantilever.h | 0 .../TestCpp/Classes/Box2DTestBed/Tests/Car.h | 0 .../Classes/Box2DTestBed/Tests/Chain.h | 0 .../Box2DTestBed/Tests/CharacterCollision.h | 0 .../Box2DTestBed/Tests/CollisionFiltering.h | 0 .../Box2DTestBed/Tests/CollisionProcessing.h | 0 .../Box2DTestBed/Tests/CompoundShapes.h | 0 .../Classes/Box2DTestBed/Tests/Confined.h | 0 .../Box2DTestBed/Tests/ContinuousTest.h | 0 .../Classes/Box2DTestBed/Tests/ConvexHull.h | 0 .../Classes/Box2DTestBed/Tests/ConveyorBelt.h | 0 .../Classes/Box2DTestBed/Tests/DistanceTest.h | 0 .../Classes/Box2DTestBed/Tests/Dominos.h | 0 .../Classes/Box2DTestBed/Tests/DumpShell.h | 0 .../Box2DTestBed/Tests/DynamicTreeTest.h | 0 .../Classes/Box2DTestBed/Tests/EdgeShapes.h | 0 .../Classes/Box2DTestBed/Tests/EdgeTest.h | 0 .../Classes/Box2DTestBed/Tests/Gears.h | 0 .../Classes/Box2DTestBed/Tests/Mobile.h | 0 .../Box2DTestBed/Tests/MobileBalanced.h | 0 .../Classes/Box2DTestBed/Tests/MotorJoint.h | 0 .../Box2DTestBed/Tests/OneSidedPlatform.h | 0 .../Classes/Box2DTestBed/Tests/Pinball.h | 0 .../Box2DTestBed/Tests/PolyCollision.h | 0 .../Classes/Box2DTestBed/Tests/PolyShapes.h | 0 .../Classes/Box2DTestBed/Tests/Prismatic.h | 0 .../Classes/Box2DTestBed/Tests/Pulleys.h | 0 .../Classes/Box2DTestBed/Tests/Pyramid.h | 0 .../Classes/Box2DTestBed/Tests/RayCast.h | 0 .../Classes/Box2DTestBed/Tests/Revolute.h | 0 .../TestCpp/Classes/Box2DTestBed/Tests/Rope.h | 0 .../Classes/Box2DTestBed/Tests/RopeJoint.h | 0 .../Classes/Box2DTestBed/Tests/SensorTest.h | 0 .../Classes/Box2DTestBed/Tests/ShapeEditing.h | 0 .../Classes/Box2DTestBed/Tests/SliderCrank.h | 0 .../Classes/Box2DTestBed/Tests/SphereStack.h | 0 .../Classes/Box2DTestBed/Tests/TheoJansen.h | 0 .../Classes/Box2DTestBed/Tests/Tiles.h | 0 .../Classes/Box2DTestBed/Tests/TimeOfImpact.h | 0 .../Classes/Box2DTestBed/Tests/Tumbler.h | 0 .../Box2DTestBed/Tests/VaryingFriction.h | 0 .../Box2DTestBed/Tests/VaryingRestitution.h | 0 .../Box2DTestBed/Tests/VerticalStack.h | 0 .../TestCpp/Classes/Box2DTestBed/Tests/Web.h | 0 .../TestCpp/Classes/BugsTest/Bug-1159.cpp | 0 .../TestCpp/Classes/BugsTest/Bug-1159.h | 0 .../TestCpp/Classes/BugsTest/Bug-1174.cpp | 0 .../TestCpp/Classes/BugsTest/Bug-1174.h | 0 .../TestCpp/Classes/BugsTest/Bug-350.cpp | 0 .../TestCpp/Classes/BugsTest/Bug-350.h | 0 .../TestCpp/Classes/BugsTest/Bug-422.cpp | 0 .../TestCpp/Classes/BugsTest/Bug-422.h | 0 .../Classes/BugsTest/Bug-458/Bug-458.cpp | 0 .../Classes/BugsTest/Bug-458/Bug-458.h | 0 .../Bug-458/QuestionContainerSprite.cpp | 0 .../Bug-458/QuestionContainerSprite.h | 0 .../TestCpp/Classes/BugsTest/Bug-624.cpp | 0 .../TestCpp/Classes/BugsTest/Bug-624.h | 0 .../TestCpp/Classes/BugsTest/Bug-886.cpp | 0 .../TestCpp/Classes/BugsTest/Bug-886.h | 0 .../TestCpp/Classes/BugsTest/Bug-899.cpp | 0 .../TestCpp/Classes/BugsTest/Bug-899.h | 0 .../TestCpp/Classes/BugsTest/Bug-914.cpp | 0 .../TestCpp/Classes/BugsTest/Bug-914.h | 0 .../TestCpp/Classes/BugsTest/BugsTest.cpp | 0 .../TestCpp/Classes/BugsTest/BugsTest.h | 0 .../Classes/ChipmunkTest/ChipmunkTest.cpp | 0 .../Classes/ChipmunkTest/ChipmunkTest.h | 0 .../ClickAndMoveTest/ClickAndMoveTest.cpp | 0 .../ClickAndMoveTest/ClickAndMoveTest.h | 0 .../ClippingNodeTest/ClippingNodeTest.cpp | 0 .../ClippingNodeTest/ClippingNodeTest.h | 0 .../CocosDenshionTest/CocosDenshionTest.cpp | 0 .../CocosDenshionTest/CocosDenshionTest.h | 0 .../ConfigurationTest/ConfigurationTest.cpp | 0 .../ConfigurationTest/ConfigurationTest.h | 0 .../Classes/ConsoleTest/ConsoleTest.cpp | 0 .../TestCpp/Classes/ConsoleTest/ConsoleTest.h | 0 .../TestCpp/Classes/CurlTest/CurlTest.cpp | 0 .../TestCpp/Classes/CurlTest/CurlTest.h | 0 .../CurrentLanguageTest.cpp | 0 .../CurrentLanguageTest/CurrentLanguageTest.h | 0 .../DataVisitorTest/DataVisitorTest.cpp | 0 .../Classes/DataVisitorTest/DataVisitorTest.h | 0 .../DrawPrimitivesTest/DrawPrimitivesTest.cpp | 0 .../DrawPrimitivesTest/DrawPrimitivesTest.h | 0 .../EffectsAdvancedTest.cpp | 0 .../EffectsAdvancedTest/EffectsAdvancedTest.h | 0 .../Classes/EffectsTest/EffectsTest.cpp | 0 .../TestCpp/Classes/EffectsTest/EffectsTest.h | 0 .../CocoStudioArmatureTest/ArmatureScene.cpp | 0 .../CocoStudioArmatureTest/ArmatureScene.h | 0 .../ComponentsTestScene.cpp | 0 .../ComponentsTestScene.h | 0 .../EnemyController.cpp | 0 .../EnemyController.h | 0 .../GameOverScene.cpp | 0 .../CocoStudioComponentsTest/GameOverScene.h | 0 .../PlayerController.cpp | 0 .../PlayerController.h | 0 .../ProjectileController.cpp | 0 .../ProjectileController.h | 0 .../SceneController.cpp | 0 .../SceneController.h | 0 .../CocoStudioGUITest/CocosGUIScene.cpp | 0 .../CocoStudioGUITest/CocosGUIScene.h | 0 .../UIButtonTest/UIButtonTest.cpp | 0 .../UIButtonTest/UIButtonTest.h | 0 .../UICheckBoxTest/UICheckBoxTest.cpp | 0 .../UICheckBoxTest/UICheckBoxTest.h | 0 .../UIImageViewTest/UIImageViewTest.cpp | 0 .../UIImageViewTest/UIImageViewTest.h | 0 .../UILabelAtlasTest/UILabelAtlasTest.cpp | 0 .../UILabelAtlasTest/UILabelAtlasTest.h | 0 .../UILabelBMFontTest/UILabelBMFontTest.cpp | 0 .../UILabelBMFontTest/UILabelBMFontTest.h | 0 .../UILabelTest/UILabelTest.cpp | 0 .../UILabelTest/UILabelTest.h | 0 .../UILayoutTest/UILayoutTest.cpp | 0 .../UILayoutTest/UILayoutTest.h | 0 .../UIListViewTest/UIListViewTest.cpp | 0 .../UIListViewTest/UIListViewTest.h | 0 .../UILoadingBarTest/UILoadingBarTest.cpp | 0 .../UILoadingBarTest/UILoadingBarTest.h | 0 .../UIPageViewTest/UIPageViewTest.cpp | 0 .../UIPageViewTest/UIPageViewTest.h | 0 .../CocoStudioGUITest/UIScene.cpp | 0 .../CocoStudioGUITest/UIScene.h | 0 .../CocoStudioGUITest/UISceneManager.cpp | 0 .../CocoStudioGUITest/UISceneManager.h | 0 .../UIScrollViewTest/UIScrollViewTest.cpp | 0 .../UIScrollViewTest/UIScrollViewTest.h | 0 .../UISliderTest/UISliderTest.cpp | 0 .../UISliderTest/UISliderTest.h | 0 .../UITextFieldTest/UITextFieldTest.cpp | 0 .../UITextFieldTest/UITextFieldTest.h | 0 .../UIWidgetAddNodeTest.cpp | 0 .../UIWidgetAddNodeTest/UIWidgetAddNodeTest.h | 0 .../CocoStudioSceneTest/SceneEditorTest.cpp | 0 .../CocoStudioSceneTest/SceneEditorTest.h | 0 .../TriggerCode/EventDef.h | 0 .../CocoStudioSceneTest/TriggerCode/acts.cpp | 0 .../CocoStudioSceneTest/TriggerCode/acts.h | 0 .../CocoStudioSceneTest/TriggerCode/cons.cpp | 0 .../CocoStudioSceneTest/TriggerCode/cons.h | 0 .../AnimationsTest/AnimationsLayerLoader.h | 0 .../AnimationsTest/AnimationsTestLayer.cpp | 0 .../AnimationsTest/AnimationsTestLayer.h | 0 .../ButtonTest/ButtonTestLayer.cpp | 0 .../ButtonTest/ButtonTestLayer.h | 0 .../ButtonTest/ButtonTestLayerLoader.h | 0 .../CocosBuilderTest/CocosBuilderTest.cpp | 0 .../CocosBuilderTest/CocosBuilderTest.h | 0 .../HelloCocosBuilderLayer.cpp | 0 .../HelloCocosBuilderLayer.h | 0 .../HelloCocosBuilderLayerLoader.h | 0 .../LabelTest/LabelTestLayer.h | 0 .../LabelTest/LabelTestLayerLoader.h | 0 .../MenuTest/MenuTestLayer.cpp | 0 .../CocosBuilderTest/MenuTest/MenuTestLayer.h | 0 .../MenuTest/MenuTestLayerLoader.h | 0 .../ParticleSystemTestLayer.h | 0 .../ParticleSystemTestLayerLoader.h | 0 .../ScrollViewTest/ScrollViewTestLayer.h | 0 .../ScrollViewTestLayerLoader.h | 0 .../SpriteTest/SpriteTestLayer.h | 0 .../SpriteTest/SpriteTestLayerLoader.h | 0 .../TestHeader/TestHeaderLayer.cpp | 0 .../TestHeader/TestHeaderLayer.h | 0 .../TestHeader/TestHeaderLayerLoader.h | 0 .../TimelineCallbackLayerLoader.h | 0 .../TimelineCallbackTestLayer.cpp | 0 .../TimelineCallbackTestLayer.h | 0 .../CCControlButtonTest.cpp | 0 .../CCControlButtonTest/CCControlButtonTest.h | 0 .../CCControlColourPickerTest.cpp | 0 .../CCControlColourPickerTest.h | 0 .../CCControlPotentiometerTest.cpp | 0 .../CCControlPotentiometerTest.h | 0 .../ControlExtensionTest/CCControlScene.cpp | 0 .../ControlExtensionTest/CCControlScene.h | 0 .../CCControlSceneManager.cpp | 0 .../CCControlSceneManager.h | 0 .../CCControlSliderTest.cpp | 0 .../CCControlSliderTest/CCControlSliderTest.h | 0 .../CCControlStepperTest.cpp | 0 .../CCControlStepperTest.h | 0 .../CCControlSwitchTest.cpp | 0 .../CCControlSwitchTest/CCControlSwitchTest.h | 0 .../EditBoxTest/EditBoxTest.cpp | 0 .../ExtensionsTest/EditBoxTest/EditBoxTest.h | 0 .../Classes/ExtensionsTest/ExtensionsTest.cpp | 0 .../Classes/ExtensionsTest/ExtensionsTest.h | 0 .../NetworkTest/HttpClientTest.cpp | 0 .../NetworkTest/HttpClientTest.h | 0 .../NetworkTest/SocketIOTest.cpp | 0 .../ExtensionsTest/NetworkTest/SocketIOTest.h | 0 .../NetworkTest/WebSocketTest.cpp | 0 .../NetworkTest/WebSocketTest.h | 0 .../NotificationCenterTest.cpp | 0 .../NotificationCenterTest.h | 0 .../Scale9SpriteTest/Scale9SpriteTest.cpp | 0 .../Scale9SpriteTest/Scale9SpriteTest.h | 0 .../TableViewTest/CustomTableViewCell.cpp | 0 .../TableViewTest/CustomTableViewCell.h | 0 .../TableViewTest/TableViewTestScene.cpp | 0 .../TableViewTest/TableViewTestScene.h | 0 .../Classes/FileUtilsTest/FileUtilsTest.cpp | 0 .../Classes/FileUtilsTest/FileUtilsTest.h | 0 .../TestCpp/Classes/FontTest/FontTest.cpp | 0 .../TestCpp/Classes/FontTest/FontTest.h | 0 .../TestCpp/Classes/InputTest/MouseTest.cpp | 0 .../TestCpp/Classes/InputTest/MouseTest.h | 0 .../Classes/IntervalTest/IntervalTest.cpp | 0 .../Classes/IntervalTest/IntervalTest.h | 0 .../Classes/KeyboardTest/KeyboardTest.cpp | 0 .../Classes/KeyboardTest/KeyboardTest.h | 0 .../TestCpp/Classes/KeypadTest/KeypadTest.cpp | 0 .../TestCpp/Classes/KeypadTest/KeypadTest.h | 0 .../TestCpp/Classes/LabelTest/LabelTest.cpp | 0 .../TestCpp/Classes/LabelTest/LabelTest.h | 0 .../Classes/LabelTest/LabelTestNew.cpp | 0 .../TestCpp/Classes/LabelTest/LabelTestNew.h | 0 .../TestCpp/Classes/LayerTest/LayerTest.cpp | 0 .../TestCpp/Classes/LayerTest/LayerTest.h | 0 .../TestCpp/Classes/MenuTest/MenuTest.cpp | 0 .../TestCpp/Classes/MenuTest/MenuTest.h | 0 .../MotionStreakTest/MotionStreakTest.cpp | 0 .../MotionStreakTest/MotionStreakTest.h | 0 .../Classes/MutiTouchTest/MutiTouchTest.cpp | 0 .../Classes/MutiTouchTest/MutiTouchTest.h | 0 .../NewEventDispatcherTest.cpp | 0 .../NewEventDispatcherTest.h | 0 .../NewRendererTest/NewRendererTest.cpp | 0 .../Classes/NewRendererTest/NewRendererTest.h | 0 .../TestCpp/Classes/NodeTest/NodeTest.cpp | 0 .../TestCpp/Classes/NodeTest/NodeTest.h | 0 .../Classes/ParallaxTest/ParallaxTest.cpp | 0 .../Classes/ParallaxTest/ParallaxTest.h | 0 .../Classes/ParticleTest/ParticleTest.cpp | 0 .../Classes/ParticleTest/ParticleTest.h | 0 .../PerformanceTest/PerformanceAllocTest.cpp | 0 .../PerformanceTest/PerformanceAllocTest.h | 0 .../PerformanceContainerTest.cpp | 0 .../PerformanceContainerTest.h | 0 .../PerformanceEventDispatcherTest.cpp | 0 .../PerformanceEventDispatcherTest.h | 0 .../PerformanceTest/PerformanceLabelTest.cpp | 0 .../PerformanceTest/PerformanceLabelTest.h | 0 .../PerformanceNodeChildrenTest.cpp | 0 .../PerformanceNodeChildrenTest.h | 0 .../PerformanceParticleTest.cpp | 0 .../PerformanceTest/PerformanceParticleTest.h | 0 .../PerformanceRendererTest.cpp | 0 .../PerformanceTest/PerformanceRendererTest.h | 0 .../PerformanceTest/PerformanceSpriteTest.cpp | 0 .../PerformanceTest/PerformanceSpriteTest.h | 0 .../PerformanceTest/PerformanceTest.cpp | 0 .../Classes/PerformanceTest/PerformanceTest.h | 0 .../PerformanceTextureTest.cpp | 0 .../PerformanceTest/PerformanceTextureTest.h | 0 .../PerformanceTouchesTest.cpp | 0 .../PerformanceTest/PerformanceTouchesTest.h | 0 .../Classes/PhysicsTest/PhysicsTest.cpp | 0 .../TestCpp/Classes/PhysicsTest/PhysicsTest.h | 0 .../ReleasePoolTest/ReleasePoolTest.cpp | 0 .../Classes/ReleasePoolTest/ReleasePoolTest.h | 0 .../RenderTextureTest/RenderTextureTest.cpp | 0 .../RenderTextureTest/RenderTextureTest.h | 0 .../RotateWorldTest/RotateWorldTest.cpp | 0 .../Classes/RotateWorldTest/RotateWorldTest.h | 0 .../TestCpp/Classes/SceneTest/SceneTest.cpp | 0 .../TestCpp/Classes/SceneTest/SceneTest.h | 0 .../Classes/SchedulerTest/SchedulerTest.cpp | 0 .../Classes/SchedulerTest/SchedulerTest.h | 0 .../TestCpp/Classes/ShaderTest/ShaderTest.cpp | 0 .../TestCpp/Classes/ShaderTest/ShaderTest.h | 0 .../Classes/ShaderTest/ShaderTest2.cpp | 0 .../TestCpp/Classes/ShaderTest/ShaderTest2.h | 0 .../TestCpp/Classes/SpineTest/SpineTest.cpp | 0 .../TestCpp/Classes/SpineTest/SpineTest.h | 0 .../SpriteTest/SpriteTest.cpp.REMOVED.git-id | 0 .../TestCpp/Classes/SpriteTest/SpriteTest.h | 0 .../Classes/TextInputTest/TextInputTest.cpp | 0 .../Classes/TextInputTest/TextInputTest.h | 0 .../Classes/Texture2dTest/Texture2dTest.cpp | 0 .../Classes/Texture2dTest/Texture2dTest.h | 0 .../TextureCacheTest/TextureCacheTest.cpp | 0 .../TextureCacheTest/TextureCacheTest.h | 0 .../TextureAtlasEncryptionTest.cpp | 0 .../TextureAtlasEncryptionTest.h | 0 .../Classes/TileMapTest/TileMapTest.cpp | 0 .../TestCpp/Classes/TileMapTest/TileMapTest.h | 0 .../TestCpp/Classes/TouchesTest/Ball.cpp | 0 .../TestCpp/Classes/TouchesTest/Ball.h | 0 .../TestCpp/Classes/TouchesTest/Paddle.cpp | 0 .../TestCpp/Classes/TouchesTest/Paddle.h | 0 .../Classes/TouchesTest/TouchesTest.cpp | 0 .../TestCpp/Classes/TouchesTest/TouchesTest.h | 0 .../TransitionsTest/TransitionsTest.cpp | 0 .../Classes/TransitionsTest/TransitionsTest.h | 0 .../TestCpp/Classes/UnitTest/UnitTest.cpp | 0 .../TestCpp/Classes/UnitTest/UnitTest.h | 0 .../UserDefaultTest/UserDefaultTest.cpp | 0 .../Classes/UserDefaultTest/UserDefaultTest.h | 0 .../{Cpp => }/TestCpp/Classes/VisibleRect.cpp | 0 .../{Cpp => }/TestCpp/Classes/VisibleRect.h | 0 .../Classes/ZwoptexTest/ZwoptexTest.cpp | 0 .../TestCpp/Classes/ZwoptexTest/ZwoptexTest.h | 0 .../{Cpp => }/TestCpp/Classes/controller.cpp | 0 .../{Cpp => }/TestCpp/Classes/controller.h | 0 .../{Cpp => }/TestCpp/Classes/testBasic.cpp | 0 samples/{Cpp => }/TestCpp/Classes/testBasic.h | 0 .../{Cpp => }/TestCpp/Classes/testResource.h | 0 samples/{Cpp => }/TestCpp/Classes/tests.h | 0 .../HelloCpp => TestCpp}/Resources/.gitignore | 0 .../Resources/Hello.png.REMOVED.git-id | 0 .../Images/HelloWorld.png.REMOVED.git-id | 0 .../PlanetCute-1024x1024.png.REMOVED.git-id | 0 .../Images/atlastest.png.REMOVED.git-id | 0 .../Images/background1.png.REMOVED.git-id | 0 .../Images/background2.jpg.REMOVED.git-id | 0 .../Images/background2.png.REMOVED.git-id | 0 .../Images/bugs/bug886.png.REMOVED.git-id | 0 ...ossini_dance_atlas-mono.png.REMOVED.git-id | 0 .../landscape-1024x1024.png.REMOVED.git-id | 0 .../Resources/Images/noise.png.REMOVED.git-id | 0 .../Images/spritesheet1.png.REMOVED.git-id | 0 .../Resources/Images/stone.png.REMOVED.git-id | 0 .../Images/test_1021x1024.png.REMOVED.git-id | 0 .../test_1021x1024_a8.pvr.REMOVED.git-id | 0 .../test_1021x1024_rgb888.pvr.REMOVED.git-id | 0 ...est_1021x1024_rgb888.pvr.gz.REMOVED.git-id | 0 ...test_1021x1024_rgba4444.pvr.REMOVED.git-id | 0 ...t_1021x1024_rgba4444.pvr.gz.REMOVED.git-id | 0 ...test_1021x1024_rgba8888.pvr.REMOVED.git-id | 0 ...t_1021x1024_rgba8888.pvr.gz.REMOVED.git-id | 0 .../Resources/Misc/resources-hd/test4.txt | 0 .../Resources/Misc/resources-ipad/test2.txt | 0 .../Resources/Misc/resources-ipadhd/test1.txt | 0 .../Resources/Misc/resources-iphone/test6.txt | 0 .../Resources/Misc/resources-mac/test2.txt | 0 .../Resources/Misc/resources-machd/test1.txt | 0 .../Resources/Misc/resources-wide/test5.txt | 0 .../Resources/Misc/resources-widehd/test3.txt | 0 .../Resources/Misc/searchpath1/file1.txt | 0 .../Misc/searchpath2/resources-ipad/file2.txt | 0 .../Resources/Shaders/example_ColorBars.vsh | 0 .../Resources/Shaders/example_Flower.vsh | 0 .../Resources/Shaders/example_Heart.vsh | 0 .../Resources/Shaders/example_Julia.vsh | 0 .../Resources/Shaders/example_Mandelbrot.vsh | 0 .../Resources/Shaders/example_Monjori.vsh | 0 .../Resources/Shaders/example_Plasma.vsh | 0 .../Resources/Shaders/example_Twist.vsh | 0 .../TileMaps/hexa-tiles.png.REMOVED.git-id | 0 .../TileMaps/map/slcj.png.REMOVED.git-id | 0 .../TileMaps/ortho-test1.png.REMOVED.git-id | 0 .../ortho-test1_bw.png.REMOVED.git-id | 0 .../Resources/animations/grossini.plist.xml | 0 .../armature/Cowboy.ExportJson.REMOVED.git-id | 0 .../armature/Cowboy0.png.REMOVED.git-id | 0 .../TestCpp/Resources/armature/Dragon.xml | 0 .../HeroAnimation.ExportJson.REMOVED.git-id | 0 .../TestCpp/Resources/armature/cyborg.xml | 0 .../TestCpp/Resources/armature/knight.xml | 0 .../TestCpp/Resources/armature/robot.xml | 0 .../TestCpp/Resources/armature/weapon.xml | 0 .../background-music-aac.wav.REMOVED.git-id | 0 .../Resources/background.mp3.REMOVED.git-id | 0 .../Resources/ccb/flower.jpg.REMOVED.git-id | 0 .../Resources/ccb/gem-0.wav.REMOVED.git-id | 0 .../Resources/ccb/gem-1.wav.REMOVED.git-id | 0 .../ccb/markerfelt24shadow.fnt.REMOVED.git-id | 0 .../cocosgui/Hello.png.REMOVED.git-id | 0 .../UITest/background.png.REMOVED.git-id | 0 .../Resources/cocosgui/b11.png.REMOVED.git-id | 0 .../bitmapFontTest2.png.REMOVED.git-id | 0 .../examples/examples.json.REMOVED.git-id | 0 .../map_1/map_pve.png.REMOVED.git-id | 0 .../page_1/background.png.REMOVED.git-id | 0 .../extensions/background.png.REMOVED.git-id | 0 .../fonts/Courier New.ttf.REMOVED.git-id | 0 .../fonts/Thonburi.ttf.REMOVED.git-id | 0 .../fonts/ThonburiBold.ttf.REMOVED.git-id | 0 .../fonts/arial-26-en-ru_0.png.REMOVED.git-id | 0 .../fonts/arial-unicode-26.GlyphProject | Bin .../fonts/arial-unicode-26.png.REMOVED.git-id | 0 .../Resources/fonts/arial.ttf.REMOVED.git-id | 0 .../bitmapFontChinese.png.REMOVED.git-id | 0 .../fonts/bitmapFontTest.png.REMOVED.git-id | 0 .../fonts/bitmapFontTest2.bmp.REMOVED.git-id | 0 .../fonts/bitmapFontTest2.png.REMOVED.git-id | 0 .../fonts/boundsTestFont.png.REMOVED.git-id | 0 .../font-issue1343-hd.png.REMOVED.git-id | 0 .../fonts/futura-48.png.REMOVED.git-id | 0 .../helvetica-geneva-32.png.REMOVED.git-id | 0 .../fonts/markerFelt.fnt.REMOVED.git-id | 0 .../TestCpp/Resources/fonts/strings.xml | 0 .../Resources/fonts/tahoma.ttf.REMOVED.git-id | 0 .../Resources/fonts/wt021.ttf.REMOVED.git-id | 0 .../hd/Images/background1.png.REMOVED.git-id | 0 .../hd/Images/background2.jpg.REMOVED.git-id | 0 .../hd/Images/background2.png.REMOVED.git-id | 0 .../hd/armature/Cowboy0.png.REMOVED.git-id | 0 .../hd/armature/Dragon.png.REMOVED.git-id | 0 .../HeroAnimation0.png.REMOVED.git-id | 0 .../hd/armature/weapon.png.REMOVED.git-id | 0 .../Resources/hd/ccb/burst.png.REMOVED.git-id | 0 .../hd/cocosgui/Hello.png.REMOVED.git-id | 0 .../UITest/background.png.REMOVED.git-id | 0 .../hd/cocosgui/b11.png.REMOVED.git-id | 0 .../bitmapFontTest2.png.REMOVED.git-id | 0 .../examples/examples.json.REMOVED.git-id | 0 .../map_1/map_pve.png.REMOVED.git-id | 0 .../page_1/background.png.REMOVED.git-id | 0 .../extensions/background.png.REMOVED.git-id | 0 .../fonts/font-issue1343.png.REMOVED.git-id | 0 .../hd/fonts/markerFelt.fnt.REMOVED.git-id | 0 .../hd/fonts/markerFelt.png.REMOVED.git-id | 0 ...ffy_bold_italic-charmap.png.REMOVED.git-id | 0 .../Images/startMenuBG.png.REMOVED.git-id | 0 .../Butterflyfish0.png.REMOVED.git-id | 0 .../blowFish/Blowfish0.png.REMOVED.git-id | 0 .../Images/startMenuBG.png.REMOVED.git-id | 0 .../Misc/music_logo.mp3.REMOVED.git-id | 0 .../Misc/music_logo.wav.REMOVED.git-id | 0 .../starMenuButton01.png.REMOVED.git-id | 0 .../starMenuButton02.png.REMOVED.git-id | 0 .../Fish_UI/ui_logo_001-hd.png.REMOVED.git-id | 0 .../CowBoy/Cowboy.ExportJson.REMOVED.git-id | 0 .../CowBoy/Cowboy0.png.REMOVED.git-id | 0 .../Images/startMenuBG.png.REMOVED.git-id | 0 .../Misc/music_logo.mp3.REMOVED.git-id | 0 .../Misc/music_logo.wav.REMOVED.git-id | 0 .../Butterflyfish0.png.REMOVED.git-id | 0 .../blowFish/Blowfish0.png.REMOVED.git-id | 0 .../starMenuButton01.png.REMOVED.git-id | 0 .../starMenuButton02.png.REMOVED.git-id | 0 .../Fish_UI/ui_logo_001-hd.png.REMOVED.git-id | 0 .../Images/startMenuBG.png.REMOVED.git-id | 0 .../Butterflyfish0.png.REMOVED.git-id | 0 .../blowFish/Blowfish0.png.REMOVED.git-id | 0 .../Images/startMenuBG.png.REMOVED.git-id | 0 .../Butterflyfish0.png.REMOVED.git-id | 0 .../blowFish/Blowfish0.png.REMOVED.git-id | 0 .../hd/spine/goblins.png.REMOVED.git-id | 0 .../hd/spine/spineboy.png.REMOVED.git-id | 0 .../ipad/ccb/burst.png.REMOVED.git-id | 0 .../extensions/background.png.REMOVED.git-id | 0 .../Images/startMenuBG.png.REMOVED.git-id | 0 .../Butterflyfish0.png.REMOVED.git-id | 0 .../blowFish/Blowfish0.png.REMOVED.git-id | 0 .../Images/startMenuBG.png.REMOVED.git-id | 0 .../Misc/music_logo.mp3.REMOVED.git-id | 0 .../Misc/music_logo.wav.REMOVED.git-id | 0 .../Fish_UI/ui_logo_001-hd.png.REMOVED.git-id | 0 .../CowBoy/Cowboy.ExportJson.REMOVED.git-id | 0 .../CowBoy/Cowboy0.png.REMOVED.git-id | 0 .../Images/startMenuBG.png.REMOVED.git-id | 0 .../Misc/music_logo.mp3.REMOVED.git-id | 0 .../Misc/music_logo.wav.REMOVED.git-id | 0 .../Butterflyfish0.png.REMOVED.git-id | 0 .../blowFish/Blowfish0.png.REMOVED.git-id | 0 .../Fish_UI/ui_logo_001-hd.png.REMOVED.git-id | 0 .../Images/startMenuBG.png.REMOVED.git-id | 0 .../Butterflyfish0.png.REMOVED.git-id | 0 .../blowFish/Blowfish0.png.REMOVED.git-id | 0 .../Images/startMenuBG.png.REMOVED.git-id | 0 .../Butterflyfish0.png.REMOVED.git-id | 0 .../blowFish/Blowfish0.png.REMOVED.git-id | 0 .../spine/goblins.png.REMOVED.git-id | 0 .../proj.android/.classpath | 0 .../Javah_jni_builder.launch | 0 .../{Cpp => }/TestCpp/proj.android/.project | 0 .../org.eclipse.cdt.codan.core.prefs | 0 .../TestCpp/proj.android/AndroidManifest.xml | 0 .../proj.android/README.md | 0 .../proj.android/ant.properties | 0 .../{Cpp => }/TestCpp/proj.android/build.xml | 0 .../TestCpp/proj.android/jni/Android.mk | 0 .../TestCpp/proj.android/jni/Application.mk | 0 .../TestCpp/proj.android/jni/testcpp/main.cpp | 0 .../{Cpp => }/TestCpp/proj.android/ndkgdb.sh | 0 .../proj.android/proguard-project.txt | 0 .../proj.android/project.properties | 0 .../proj.android/res/values/strings.xml | 0 .../TestCpp/proj.android/src/nojava.txt | 0 .../cocos2dx/testcpp/Cocos2dxActivity.java | 0 .../proj.ios/Classes/RootViewController.h | 0 .../proj.ios/Classes/RootViewController.mm | 0 .../proj.ios/Classes/testsAppDelegate.h | 0 .../proj.ios/Classes/testsAppDelegate.mm | 0 .../Default-568h@2x.png.REMOVED.git-id | 0 .../proj.ios/Default@2x.png.REMOVED.git-id | 0 .../TestCpp/proj.ios/iphone_Prefix.pch | 0 samples/{Cpp => }/TestCpp/proj.ios/main.m | 0 samples/{Cpp => }/TestCpp/proj.linux/main.cpp | 0 .../proj.mac/Icon.icns.REMOVED.git-id | 0 .../TestCpp/proj.mac/Test_Prefix.pch | 0 .../proj.mac/en.lproj/InfoPlist.strings | 0 .../TestCpp/proj.mac/en.lproj/MainMenu.xib | 0 samples/{Cpp => }/TestCpp/proj.mac/main.cpp | 0 .../TestCpp/proj.win32/TestCpp.vcxproj | 0 .../proj.win32/TestCpp.vcxproj.filters | 0 .../TestCpp/proj.win32/TestCpp.vcxproj.user | 0 samples/{Cpp => }/TestCpp/proj.win32/main.cpp | 0 .../HelloCpp => TestCpp}/proj.win32/main.h | 0 .../TestJavascript/Classes/AppDelegate.cpp | 0 .../Classes/AppDelegate.h | 0 .../proj.android/.classpath | 0 .../TestJavascript/proj.android/.project | 0 .../proj.android/.settings/.jsdtscope | 0 .../org.eclipse.cdt.codan.core.prefs | 0 .../.settings/org.eclipse.wst.jsdt.ui.prefs | 0 ...rg.eclipse.wst.jsdt.ui.superType.container | 0 .../org.eclipse.wst.jsdt.ui.superType.name | 0 .../proj.android/AndroidManifest.xml | 0 .../proj.android/README.md | 0 .../proj.android/ant.properties | 0 .../TestJavascript/proj.android/build.xml | 0 .../proj.android/jni/Android.mk | 0 .../proj.android/jni/Application.mk | 0 .../proj.android/jni/testjavascript}/main.cpp | 0 .../TestJavascript/proj.android/ndkgdb.sh | 0 .../proj.android/proguard-project.txt | 0 .../proj.android/project.properties | 0 .../proj.android/res/values/strings.xml | 0 .../testjavascript/Cocos2dxActivity.java | 0 .../proj.ios/AppController.h | 0 .../TestJavascript/proj.ios/AppController.mm | 0 .../Default-568h@2x.png.REMOVED.git-id | 0 .../proj.ios/Default@2x.png.REMOVED.git-id | 0 .../proj.ios/Prefix.pch | 0 .../proj.ios/RootViewController.h | 0 .../proj.ios/RootViewController.mm | 0 .../proj.ios/main.m | 0 .../proj.mac/Icon.icns.REMOVED.git-id | 0 .../TestJavascript/proj.mac/Test_Prefix.pch | 0 .../proj.mac/en.lproj/InfoPlist.strings | 0 .../proj.mac/en.lproj/MainMenu.xib | 0 .../TestJavascript/proj.mac/main.cpp | 0 .../proj.win32/TestJavascript.vcxproj | 0 .../proj.win32/TestJavascript.vcxproj.filters | 0 .../proj.win32/TestJavascript.vcxproj.user | 0 .../TestJavascript/proj.win32/main.cpp | 0 .../proj.win32/main.h | 0 .../proj.win32/res/testjs.ico | Bin .../proj.win32/resource.h | 0 .../proj.win32/testjs.rc | 0 samples/{Lua => }/TestLua/.gitignore | 0 samples/{Lua => }/TestLua/CMakeLists.txt | 0 .../{Lua => }/TestLua/Classes/AppDelegate.cpp | 0 .../{Lua => }/TestLua/Classes/AppDelegate.h | 0 .../Classes/lua_assetsmanager_test_sample.cpp | 0 .../Classes/lua_assetsmanager_test_sample.h | 0 .../ccb/flower.jpg.REMOVED.git-id | 0 .../ccb/gem-0.wav.REMOVED.git-id | 0 .../ccb/gem-1.wav.REMOVED.git-id | 0 .../ccb/markerfelt24shadow.fnt.REMOVED.git-id | 0 .../AccelerometerTest/AccelerometerTest.lua | 0 .../ActionManagerTest/ActionManagerTest.lua | 0 .../ActionsEaseTest/ActionsEaseTest.lua | 0 .../ActionsProgressTest.lua | 0 .../luaScript/ActionsTest/ActionsTest.lua | 0 .../AssetsManagerTest/AssetsManagerModule.lua | 0 .../AssetsManagerTest/AssetsManagerTest.lua | 0 .../Resources/luaScript/BugsTest/BugsTest.lua | 0 .../ClickAndMoveTest/ClickAndMoveTest.lua | 0 .../CocoStudioArmatureTest.lua | 0 .../CocoStudioGUITest.lua.REMOVED.git-id | 0 .../CocoStudioSceneTest.lua | 0 .../CocoStudioSceneTest/TriggerCode/acts.lua | 0 .../CocoStudioSceneTest/TriggerCode/cons.lua | 0 .../TriggerCode/eventDef.lua | 0 .../CocoStudioTest/CocoStudioTest.lua | 0 .../CocosDenshionTest/CocosDenshionTest.lua | 0 .../CurrentLanguageTest.lua | 0 .../DrawPrimitivesTest/DrawPrimitivesTest.lua | 0 .../EffectsAdvancedTest.lua | 0 .../luaScript/EffectsTest/EffectsName.lua | 0 .../luaScript/EffectsTest/EffectsTest.lua | 0 .../ExtensionTest/CocosBuilderTest.lua | 0 .../luaScript/ExtensionTest/ExtensionTest.lua | 0 .../luaScript/ExtensionTest/WebProxyTest.lua | 0 .../Resources/luaScript/FontTest/FontTest.lua | 0 .../luaScript/IntervalTest/IntervalTest.lua | 0 .../luaScript/KeypadTest/KeypadTest.lua | 0 .../luaScript/LabelTest/LabelTest.lua | 0 .../luaScript/LabelTestNew/LabelTestNew.lua | 0 .../luaScript/LayerTest/LayerTest.lua | 0 .../luaScript/LuaBridgeTest/LuaBridgeTest.lua | 0 .../Resources/luaScript/MenuTest/MenuTest.lua | 0 .../MotionStreakTest/MotionStreakTest.lua | 0 .../NewEventDispatcherTest.lua | 0 .../Resources/luaScript/NodeTest/NodeTest.lua | 0 .../luaScript/OpenGLTest/OpenGLTest.lua | 0 .../luaScript/ParallaxTest/ParallaxTest.lua | 0 .../luaScript/ParticleTest/ParticleTest.lua | 0 .../PerformanceTest/PerformanceSpriteTest.lua | 0 .../PerformanceTest/PerformanceTest.lua | 0 .../luaScript/PhysicsTest/PhysicsTest.lua | 0 .../RenderTextureTest/RenderTextureTest.lua | 0 .../RotateWorldTest/RotateWorldTest.lua | 0 .../luaScript/SceneTest/SceneTest.lua | 0 .../luaScript/SpineTest/SpineTest.lua | 0 .../luaScript/SpriteTest/SpriteTest.lua | 0 .../luaScript/Texture2dTest/Texture2dTest.lua | 0 .../luaScript/TileMapTest/TileMapTest.lua | 0 .../Resources/luaScript/TouchesTest/Ball.lua | 0 .../luaScript/TouchesTest/Paddle.lua | 0 .../luaScript/TouchesTest/TouchesTest.lua | 0 .../TransitionsTest/TransitionsName.lua | 0 .../TransitionsTest/TransitionsTest.lua | 0 .../UserDefaultTest/UserDefaultTest.lua | 0 .../Resources/luaScript/VisibleRect.lua | 0 .../XMLHttpRequestTest/XMLHttpRequestTest.lua | 0 .../luaScript/ZwoptexTest/ZwoptexTest.lua | 0 .../Resources/luaScript/controller.lua | 0 .../TestLua/Resources/luaScript/helper.lua | 0 .../TestLua/Resources/luaScript/mainMenu.lua | 0 .../Resources/luaScript/testResource.lua | 0 .../proj.android/.classpath | 0 .../{Lua => }/TestLua/proj.android/.project | 0 .../TestLua/proj.android/AndroidManifest.xml | 0 .../proj.android/ant.properties | 0 .../{Lua => }/TestLua/proj.android/build.xml | 0 .../TestLua/proj.android/jni/Android.mk | 0 .../TestLua/proj.android/jni/Application.mk | 0 .../TestLua/proj.android/jni/testlua/main.cpp | 0 .../proj.android/proguard-project.txt | 0 .../proj.android/project.properties | 0 .../proj.android/res/values/strings.xml | 0 .../LuaJavaBridgeTest/LuaJavaBridgeTest.java | 0 .../cocos2dx/testlua/Cocos2dxActivity.java | 0 .../proj.ios/AppController.h | 0 .../TestLua/proj.ios/AppController.mm | 0 .../Default-568h@2x.png.REMOVED.git-id | 0 .../proj.ios/Default@2x.png.REMOVED.git-id | 0 .../TestLua/proj.ios/LuaObjectCBridgeTest.h | 0 .../TestLua/proj.ios/LuaObjectCBridgeTest.mm | 0 .../proj.ios/RootViewController.h | 0 .../proj.ios/RootViewController.mm | 0 .../TestLua/proj.ios/TestLua_Prefix.pch | 0 samples/{Lua => }/TestLua/proj.ios/main.m | 0 samples/{Lua => }/TestLua/proj.linux/main.cpp | 0 .../proj.mac/Icon.icns.REMOVED.git-id | 0 .../TestLua/proj.mac/LuaObjectCBridgeTest.h | 0 .../TestLua/proj.mac/LuaObjectCBridgeTest.mm | 0 .../TestLua/proj.mac/TestLua_Prefix.pch | 0 .../proj.mac/en.lproj/InfoPlist.strings | 0 .../proj.mac/en.lproj/MainMenu.xib | 0 samples/{Lua => }/TestLua/proj.mac/main.cpp | 0 .../{Lua => }/TestLua/proj.win32/TestLua.rc | 0 .../TestLua/proj.win32/TestLua.win32.vcxproj | 0 .../proj.win32/TestLua.win32.vcxproj.filters | 0 .../proj.win32/TestLua.win32.vcxproj.user | 0 samples/{Lua => }/TestLua/proj.win32/main.cpp | 0 samples/{Lua => }/TestLua/proj.win32/main.h | 0 .../TestLua/proj.win32/res/TestLua.ico | Bin .../{Lua => }/TestLua/proj.win32/resource.h | 0 1008 files changed, 19325 deletions(-) delete mode 100644 samples/Cpp/AssetsManagerTest/Classes/AppDelegate.cpp delete mode 100644 samples/Cpp/AssetsManagerTest/Classes/AppDelegate.h delete mode 100644 samples/Cpp/AssetsManagerTest/README.md delete mode 100644 samples/Cpp/AssetsManagerTest/Resources/Background.png.REMOVED.git-id delete mode 100644 samples/Cpp/AssetsManagerTest/Resources/main.js delete mode 100644 samples/Cpp/AssetsManagerTest/Resources/myApp.js delete mode 100644 samples/Cpp/AssetsManagerTest/proj.android/.project delete mode 100644 samples/Cpp/AssetsManagerTest/proj.android/AndroidManifest.xml delete mode 100644 samples/Cpp/AssetsManagerTest/proj.android/build.xml delete mode 100644 samples/Cpp/AssetsManagerTest/proj.android/jni/Android.mk delete mode 100644 samples/Cpp/AssetsManagerTest/proj.android/jni/Application.mk delete mode 100644 samples/Cpp/AssetsManagerTest/proj.android/jni/hellocpp/main.cpp delete mode 100644 samples/Cpp/AssetsManagerTest/proj.android/project.properties delete mode 100644 samples/Cpp/AssetsManagerTest/proj.android/res/values/strings.xml delete mode 100644 samples/Cpp/AssetsManagerTest/proj.android/src/org/cocos2dx/AssetsManagerTest/Cocos2dxActivity.java delete mode 100644 samples/Cpp/AssetsManagerTest/proj.ios/AppController.h delete mode 100644 samples/Cpp/AssetsManagerTest/proj.ios/AppController.mm delete mode 100644 samples/Cpp/AssetsManagerTest/proj.ios/Prefix.pch delete mode 100644 samples/Cpp/AssetsManagerTest/proj.ios/RootViewController.h delete mode 100644 samples/Cpp/AssetsManagerTest/proj.ios/RootViewController.mm delete mode 100644 samples/Cpp/AssetsManagerTest/proj.ios/iTunesArtwork delete mode 100644 samples/Cpp/AssetsManagerTest/proj.ios/main.m delete mode 100644 samples/Cpp/AssetsManagerTest/proj.win32/AssetsManagerTest.vcxproj delete mode 100644 samples/Cpp/AssetsManagerTest/proj.win32/AssetsManagerTest.vcxproj.filters delete mode 100644 samples/Cpp/AssetsManagerTest/proj.win32/AssetsManagerTest.vcxproj.user delete mode 100644 samples/Cpp/AssetsManagerTest/proj.win32/main.cpp delete mode 100644 samples/Cpp/AssetsManagerTest/proj.win32/res.rc delete mode 100644 samples/Cpp/AssetsManagerTest/proj.win32/res/res.ico delete mode 100644 samples/Cpp/HelloCpp/CMakeLists.txt delete mode 100644 samples/Cpp/HelloCpp/Classes/AppDelegate.cpp delete mode 100644 samples/Cpp/HelloCpp/Classes/AppMacros.h delete mode 100644 samples/Cpp/HelloCpp/Classes/HelloWorldScene.cpp delete mode 100644 samples/Cpp/HelloCpp/Classes/HelloWorldScene.h delete mode 100644 samples/Cpp/HelloCpp/Resources/ipad/HelloWorld.png.REMOVED.git-id delete mode 100644 samples/Cpp/HelloCpp/Resources/ipadhd/HelloWorld.png.REMOVED.git-id delete mode 100644 samples/Cpp/HelloCpp/Resources/iphone/HelloWorld.png.REMOVED.git-id delete mode 100644 samples/Cpp/HelloCpp/proj.android/.project delete mode 100644 samples/Cpp/HelloCpp/proj.android/AndroidManifest.xml delete mode 100644 samples/Cpp/HelloCpp/proj.android/build.xml delete mode 100644 samples/Cpp/HelloCpp/proj.android/jni/Android.mk delete mode 100644 samples/Cpp/HelloCpp/proj.android/jni/Application.mk delete mode 100644 samples/Cpp/HelloCpp/proj.android/jni/hellocpp/main.cpp delete mode 100755 samples/Cpp/HelloCpp/proj.android/jni/list.sh delete mode 100755 samples/Cpp/HelloCpp/proj.android/ndkgdb.sh delete mode 100644 samples/Cpp/HelloCpp/proj.android/res/values/strings.xml delete mode 100644 samples/Cpp/HelloCpp/proj.android/src/org/cocos2dx/hellocpp/Cocos2dxActivity.java delete mode 100644 samples/Cpp/HelloCpp/proj.ios/AppController.mm delete mode 100644 samples/Cpp/HelloCpp/proj.ios/HelloCpp_Prefix.pch delete mode 100644 samples/Cpp/HelloCpp/proj.ios/RootViewController.mm delete mode 100644 samples/Cpp/HelloCpp/proj.ios/main.m delete mode 100644 samples/Cpp/HelloCpp/proj.linux/main.cpp delete mode 100644 samples/Cpp/HelloCpp/proj.mac/HelloCpp_Prefix.pch delete mode 100644 samples/Cpp/HelloCpp/proj.mac/main.cpp delete mode 100644 samples/Cpp/HelloCpp/proj.win32/HelloCpp.vcxproj delete mode 100644 samples/Cpp/HelloCpp/proj.win32/HelloCpp.vcxproj.filters delete mode 100644 samples/Cpp/HelloCpp/proj.win32/HelloCpp.vcxproj.user delete mode 100644 samples/Cpp/HelloCpp/proj.win32/main.cpp delete mode 100644 samples/Cpp/SimpleGame/Classes/AppDelegate.cpp delete mode 100644 samples/Cpp/SimpleGame/Classes/AppDelegate.h delete mode 100644 samples/Cpp/SimpleGame/Classes/GameOverScene.cpp delete mode 100644 samples/Cpp/SimpleGame/Classes/GameOverScene.h delete mode 100644 samples/Cpp/SimpleGame/Classes/HelloWorldScene.cpp delete mode 100644 samples/Cpp/SimpleGame/Classes/HelloWorldScene.h delete mode 100644 samples/Cpp/SimpleGame/Resources/.gitignore delete mode 100644 samples/Cpp/SimpleGame/Resources/app.config.txt delete mode 100644 samples/Cpp/SimpleGame/proj.android/.classpath delete mode 100644 samples/Cpp/SimpleGame/proj.android/.project delete mode 100644 samples/Cpp/SimpleGame/proj.android/.settings/org.eclipse.cdt.codan.core.prefs delete mode 100644 samples/Cpp/SimpleGame/proj.android/AndroidManifest.xml delete mode 100644 samples/Cpp/SimpleGame/proj.android/README.md delete mode 100644 samples/Cpp/SimpleGame/proj.android/build.xml delete mode 100644 samples/Cpp/SimpleGame/proj.android/jni/Android.mk delete mode 100644 samples/Cpp/SimpleGame/proj.android/jni/Application.mk delete mode 100644 samples/Cpp/SimpleGame/proj.android/jni/hellocpp/main.cpp delete mode 100755 samples/Cpp/SimpleGame/proj.android/jni/list.sh delete mode 100755 samples/Cpp/SimpleGame/proj.android/ndkgdb.sh delete mode 100644 samples/Cpp/SimpleGame/proj.android/project.properties delete mode 100644 samples/Cpp/SimpleGame/proj.android/res/values/strings.xml delete mode 100755 samples/Cpp/SimpleGame/proj.android/run.sh delete mode 100644 samples/Cpp/SimpleGame/proj.android/src/org/cocos2dx/simplegame/Cocos2dxActivity.java delete mode 100644 samples/Cpp/SimpleGame/proj.ios/AppController.h delete mode 100644 samples/Cpp/SimpleGame/proj.ios/AppController.mm delete mode 100644 samples/Cpp/SimpleGame/proj.ios/SimpleGame_Prefix.pch delete mode 100644 samples/Cpp/SimpleGame/proj.ios/main.m delete mode 100644 samples/Cpp/SimpleGame/proj.linux/main.cpp delete mode 100644 samples/Cpp/SimpleGame/proj.mac/SampleGame_Prefix.pch delete mode 100644 samples/Cpp/SimpleGame/proj.mac/en.lproj/MainMenu.xib delete mode 100644 samples/Cpp/SimpleGame/proj.mac/main.cpp delete mode 100644 samples/Cpp/SimpleGame/proj.win32/SimpleGame.vcxproj delete mode 100644 samples/Cpp/SimpleGame/proj.win32/SimpleGame.vcxproj.filters delete mode 100644 samples/Cpp/SimpleGame/proj.win32/SimpleGame.vcxproj.user delete mode 100644 samples/Cpp/SimpleGame/proj.win32/main.cpp delete mode 100644 samples/Cpp/SimpleGame/proj.win32/main.h delete mode 100644 samples/Cpp/TestCpp/Classes/AppDelegate.h delete mode 100644 samples/Cpp/TestCpp/Resources/.gitignore delete mode 100644 samples/Cpp/TestCpp/Resources/background-music-aac.wav.REMOVED.git-id delete mode 100644 samples/Cpp/TestCpp/proj.android/.classpath delete mode 100644 samples/Cpp/TestCpp/proj.android/.settings/org.eclipse.cdt.codan.core.prefs delete mode 100644 samples/Cpp/TestCpp/proj.android/README.md delete mode 100644 samples/Cpp/TestCpp/proj.android/ant.properties delete mode 100644 samples/Cpp/TestCpp/proj.win32/main.h delete mode 100644 samples/Javascript/CocosDragonJS/Classes/AppDelegate.cpp delete mode 100644 samples/Javascript/CocosDragonJS/proj.android/.project delete mode 100644 samples/Javascript/CocosDragonJS/proj.android/.settings/org.eclipse.cdt.codan.core.prefs delete mode 100644 samples/Javascript/CocosDragonJS/proj.android/AndroidManifest.xml delete mode 100644 samples/Javascript/CocosDragonJS/proj.android/README.md delete mode 100644 samples/Javascript/CocosDragonJS/proj.android/build.xml delete mode 100644 samples/Javascript/CocosDragonJS/proj.android/jni/Android.mk delete mode 100644 samples/Javascript/CocosDragonJS/proj.android/jni/Application.mk delete mode 100755 samples/Javascript/CocosDragonJS/proj.android/ndkgdb.sh delete mode 100644 samples/Javascript/CocosDragonJS/proj.android/proguard-project.txt delete mode 100644 samples/Javascript/CocosDragonJS/proj.android/res/values/strings.xml delete mode 100644 samples/Javascript/CocosDragonJS/proj.android/src/org/cocos2dx/cocosdragonjs/Cocos2dxActivity.java delete mode 100644 samples/Javascript/CocosDragonJS/proj.ios/AppController.mm delete mode 100644 samples/Javascript/CocosDragonJS/proj.ios/Default-568h@2x.png.REMOVED.git-id delete mode 100644 samples/Javascript/CocosDragonJS/proj.ios/Default@2x.png.REMOVED.git-id delete mode 100644 samples/Javascript/CocosDragonJS/proj.ios/RootViewController.h delete mode 100644 samples/Javascript/CocosDragonJS/proj.mac/Icon.icns.REMOVED.git-id delete mode 100644 samples/Javascript/CocosDragonJS/proj.mac/en.lproj/InfoPlist.strings delete mode 100644 samples/Javascript/CocosDragonJS/proj.mac/main.cpp delete mode 100644 samples/Javascript/CocosDragonJS/proj.win32/CocosDragonJS.vcxproj delete mode 100644 samples/Javascript/CocosDragonJS/proj.win32/CocosDragonJS.vcxproj.filters delete mode 100644 samples/Javascript/CocosDragonJS/proj.win32/CocosDragonJS.vcxproj.user delete mode 100644 samples/Javascript/CocosDragonJS/proj.win32/main.cpp delete mode 100644 samples/Javascript/CocosDragonJS/proj.win32/main.h delete mode 100644 samples/Javascript/CocosDragonJS/proj.win32/resource.h delete mode 100644 samples/Javascript/CrystalCraze/Classes/AppDelegate.cpp delete mode 100644 samples/Javascript/CrystalCraze/Classes/AppDelegate.h delete mode 100644 samples/Javascript/CrystalCraze/proj.android/.classpath delete mode 100644 samples/Javascript/CrystalCraze/proj.android/.project delete mode 100644 samples/Javascript/CrystalCraze/proj.android/.settings/org.eclipse.cdt.codan.core.prefs delete mode 100644 samples/Javascript/CrystalCraze/proj.android/AndroidManifest.xml delete mode 100644 samples/Javascript/CrystalCraze/proj.android/README.md delete mode 100644 samples/Javascript/CrystalCraze/proj.android/ant.properties delete mode 100644 samples/Javascript/CrystalCraze/proj.android/build.xml delete mode 100644 samples/Javascript/CrystalCraze/proj.android/jni/Android.mk delete mode 100644 samples/Javascript/CrystalCraze/proj.android/jni/Application.mk delete mode 100644 samples/Javascript/CrystalCraze/proj.android/jni/crystalcraze/main.cpp delete mode 100755 samples/Javascript/CrystalCraze/proj.android/ndkgdb.sh delete mode 100644 samples/Javascript/CrystalCraze/proj.android/proguard-project.txt delete mode 100644 samples/Javascript/CrystalCraze/proj.android/project.properties delete mode 100644 samples/Javascript/CrystalCraze/proj.android/res/values/strings.xml delete mode 100644 samples/Javascript/CrystalCraze/proj.android/src/org/cocos2dx/crystalcraze/Cocos2dxActivity.java delete mode 100644 samples/Javascript/CrystalCraze/proj.ios/AppController.h delete mode 100644 samples/Javascript/CrystalCraze/proj.ios/AppController.mm delete mode 100644 samples/Javascript/CrystalCraze/proj.ios/Default-568h@2x.png.REMOVED.git-id delete mode 100644 samples/Javascript/CrystalCraze/proj.ios/Default@2x.png.REMOVED.git-id delete mode 100644 samples/Javascript/CrystalCraze/proj.ios/Prefix.pch delete mode 100644 samples/Javascript/CrystalCraze/proj.ios/RootViewController.h delete mode 100644 samples/Javascript/CrystalCraze/proj.ios/RootViewController.mm delete mode 100644 samples/Javascript/CrystalCraze/proj.ios/main.m delete mode 100644 samples/Javascript/CrystalCraze/proj.mac/Icon.icns.REMOVED.git-id delete mode 100644 samples/Javascript/CrystalCraze/proj.mac/en.lproj/InfoPlist.strings delete mode 100644 samples/Javascript/CrystalCraze/proj.mac/en.lproj/MainMenu.xib delete mode 100644 samples/Javascript/CrystalCraze/proj.mac/main.cpp delete mode 100644 samples/Javascript/CrystalCraze/proj.win32/CrystalCraze.vcxproj delete mode 100644 samples/Javascript/CrystalCraze/proj.win32/CrystalCraze.vcxproj.filters delete mode 100644 samples/Javascript/CrystalCraze/proj.win32/CrystalCraze.vcxproj.user delete mode 100644 samples/Javascript/CrystalCraze/proj.win32/main.cpp delete mode 100644 samples/Javascript/CrystalCraze/proj.win32/main.h delete mode 100644 samples/Javascript/CrystalCraze/proj.win32/res/testjs.ico delete mode 100644 samples/Javascript/CrystalCraze/proj.win32/resource.h delete mode 100644 samples/Javascript/CrystalCraze/proj.win32/testjs.rc delete mode 100644 samples/Javascript/MoonWarriors/Classes/AppDelegate.cpp delete mode 100644 samples/Javascript/MoonWarriors/Classes/AppDelegate.h delete mode 100644 samples/Javascript/MoonWarriors/proj.android/.classpath delete mode 100644 samples/Javascript/MoonWarriors/proj.android/.project delete mode 100644 samples/Javascript/MoonWarriors/proj.android/.settings/org.eclipse.cdt.codan.core.prefs delete mode 100644 samples/Javascript/MoonWarriors/proj.android/AndroidManifest.xml delete mode 100644 samples/Javascript/MoonWarriors/proj.android/README.md delete mode 100644 samples/Javascript/MoonWarriors/proj.android/ant.properties delete mode 100644 samples/Javascript/MoonWarriors/proj.android/build.xml delete mode 100644 samples/Javascript/MoonWarriors/proj.android/jni/Android.mk delete mode 100644 samples/Javascript/MoonWarriors/proj.android/jni/moonwarriors/main.cpp delete mode 100644 samples/Javascript/MoonWarriors/proj.android/proguard-project.txt delete mode 100644 samples/Javascript/MoonWarriors/proj.android/project.properties delete mode 100644 samples/Javascript/MoonWarriors/proj.android/res/values/strings.xml delete mode 100644 samples/Javascript/MoonWarriors/proj.android/src/org/cocos2dx/moonwarriors/Cocos2dxActivity.java delete mode 100644 samples/Javascript/MoonWarriors/proj.ios/AppController.h delete mode 100644 samples/Javascript/MoonWarriors/proj.ios/AppController.mm delete mode 100644 samples/Javascript/MoonWarriors/proj.ios/Default-568h@2x.png.REMOVED.git-id delete mode 100644 samples/Javascript/MoonWarriors/proj.ios/Default@2x.png.REMOVED.git-id delete mode 100644 samples/Javascript/MoonWarriors/proj.ios/Prefix.pch delete mode 100644 samples/Javascript/MoonWarriors/proj.ios/RootViewController.h delete mode 100644 samples/Javascript/MoonWarriors/proj.ios/RootViewController.mm delete mode 100644 samples/Javascript/MoonWarriors/proj.ios/main.m delete mode 100644 samples/Javascript/MoonWarriors/proj.mac/Icon.icns.REMOVED.git-id delete mode 100644 samples/Javascript/MoonWarriors/proj.mac/en.lproj/InfoPlist.strings delete mode 100644 samples/Javascript/MoonWarriors/proj.mac/en.lproj/MainMenu.xib delete mode 100644 samples/Javascript/MoonWarriors/proj.mac/main.cpp delete mode 100644 samples/Javascript/MoonWarriors/proj.win32/MoonWarriors.vcxproj delete mode 100644 samples/Javascript/MoonWarriors/proj.win32/MoonWarriors.vcxproj.filters delete mode 100644 samples/Javascript/MoonWarriors/proj.win32/MoonWarriors.vcxproj.user delete mode 100644 samples/Javascript/MoonWarriors/proj.win32/main.cpp delete mode 100644 samples/Javascript/MoonWarriors/proj.win32/main.h delete mode 100644 samples/Javascript/MoonWarriors/proj.win32/res/testjs.ico delete mode 100644 samples/Javascript/MoonWarriors/proj.win32/resource.h delete mode 100644 samples/Javascript/MoonWarriors/proj.win32/testjs.rc delete mode 100644 samples/Javascript/TestJavascript/Classes/AppDelegate.h delete mode 100644 samples/Javascript/TestJavascript/proj.android/.classpath delete mode 100644 samples/Javascript/TestJavascript/proj.android/.settings/org.eclipse.cdt.codan.core.prefs delete mode 100644 samples/Javascript/TestJavascript/proj.android/README.md delete mode 100644 samples/Javascript/TestJavascript/proj.android/ant.properties delete mode 100644 samples/Javascript/TestJavascript/proj.android/jni/Application.mk delete mode 100644 samples/Javascript/TestJavascript/proj.android/jni/testjavascript/main.cpp delete mode 100644 samples/Javascript/TestJavascript/proj.android/proguard-project.txt delete mode 100644 samples/Javascript/TestJavascript/proj.android/project.properties delete mode 100644 samples/Javascript/TestJavascript/proj.ios/AppController.h delete mode 100644 samples/Javascript/TestJavascript/proj.ios/Default-568h@2x.png.REMOVED.git-id delete mode 100644 samples/Javascript/TestJavascript/proj.ios/Default@2x.png.REMOVED.git-id delete mode 100644 samples/Javascript/TestJavascript/proj.ios/Prefix.pch delete mode 100644 samples/Javascript/TestJavascript/proj.ios/RootViewController.h delete mode 100644 samples/Javascript/TestJavascript/proj.ios/RootViewController.mm delete mode 100644 samples/Javascript/TestJavascript/proj.ios/main.m delete mode 100644 samples/Javascript/TestJavascript/proj.mac/Icon.icns.REMOVED.git-id delete mode 100644 samples/Javascript/TestJavascript/proj.mac/en.lproj/InfoPlist.strings delete mode 100644 samples/Javascript/TestJavascript/proj.mac/en.lproj/MainMenu.xib delete mode 100644 samples/Javascript/TestJavascript/proj.win32/main.h delete mode 100644 samples/Javascript/TestJavascript/proj.win32/res/testjs.ico delete mode 100644 samples/Javascript/TestJavascript/proj.win32/resource.h delete mode 100644 samples/Javascript/TestJavascript/proj.win32/testjs.rc delete mode 100644 samples/Javascript/WatermelonWithMe/Classes/AppDelegate.cpp delete mode 100644 samples/Javascript/WatermelonWithMe/Classes/AppDelegate.h delete mode 100644 samples/Javascript/WatermelonWithMe/proj.android/.classpath delete mode 100644 samples/Javascript/WatermelonWithMe/proj.android/.project delete mode 100644 samples/Javascript/WatermelonWithMe/proj.android/.settings/org.eclipse.cdt.codan.core.prefs delete mode 100644 samples/Javascript/WatermelonWithMe/proj.android/AndroidManifest.xml delete mode 100644 samples/Javascript/WatermelonWithMe/proj.android/README.md delete mode 100644 samples/Javascript/WatermelonWithMe/proj.android/ant.properties delete mode 100644 samples/Javascript/WatermelonWithMe/proj.android/build.xml delete mode 100644 samples/Javascript/WatermelonWithMe/proj.android/jni/Android.mk delete mode 100644 samples/Javascript/WatermelonWithMe/proj.android/jni/Application.mk delete mode 100644 samples/Javascript/WatermelonWithMe/proj.android/jni/watermelonwithme/main.cpp delete mode 100644 samples/Javascript/WatermelonWithMe/proj.android/ndkgdb.sh delete mode 100644 samples/Javascript/WatermelonWithMe/proj.android/proguard-project.txt delete mode 100644 samples/Javascript/WatermelonWithMe/proj.android/project.properties delete mode 100644 samples/Javascript/WatermelonWithMe/proj.android/res/values/strings.xml delete mode 100644 samples/Javascript/WatermelonWithMe/proj.android/src/org/cocos2dx/watermelonwithme/Cocos2dxActivity.java delete mode 100644 samples/Javascript/WatermelonWithMe/proj.ios/AppController.h delete mode 100644 samples/Javascript/WatermelonWithMe/proj.ios/AppController.mm delete mode 100644 samples/Javascript/WatermelonWithMe/proj.ios/Default-568h@2x.png.REMOVED.git-id delete mode 100644 samples/Javascript/WatermelonWithMe/proj.ios/Default@2x.png.REMOVED.git-id delete mode 100644 samples/Javascript/WatermelonWithMe/proj.ios/Prefix.pch delete mode 100644 samples/Javascript/WatermelonWithMe/proj.ios/RootViewController.h delete mode 100644 samples/Javascript/WatermelonWithMe/proj.ios/RootViewController.mm delete mode 100644 samples/Javascript/WatermelonWithMe/proj.ios/main.m delete mode 100644 samples/Javascript/WatermelonWithMe/proj.mac/Icon.icns.REMOVED.git-id delete mode 100644 samples/Javascript/WatermelonWithMe/proj.mac/en.lproj/InfoPlist.strings delete mode 100644 samples/Javascript/WatermelonWithMe/proj.mac/en.lproj/MainMenu.xib delete mode 100644 samples/Javascript/WatermelonWithMe/proj.mac/main.cpp delete mode 100644 samples/Javascript/WatermelonWithMe/proj.win32/WatermelonWithMe.vcxproj delete mode 100644 samples/Javascript/WatermelonWithMe/proj.win32/WatermelonWithMe.vcxproj.filters delete mode 100644 samples/Javascript/WatermelonWithMe/proj.win32/WatermelonWithMe.vcxproj.user delete mode 100644 samples/Javascript/WatermelonWithMe/proj.win32/main.cpp delete mode 100644 samples/Javascript/WatermelonWithMe/proj.win32/main.h delete mode 100644 samples/Javascript/WatermelonWithMe/proj.win32/res/testjs.ico delete mode 100644 samples/Javascript/WatermelonWithMe/proj.win32/resource.h delete mode 100644 samples/Javascript/WatermelonWithMe/proj.win32/testjs.rc delete mode 100644 samples/Lua/HelloLua/CMakeLists.txt delete mode 100644 samples/Lua/HelloLua/Classes/AppDelegate.cpp delete mode 100644 samples/Lua/HelloLua/Classes/AppDelegate.h delete mode 100644 samples/Lua/HelloLua/Resources/.gitignore delete mode 100644 samples/Lua/HelloLua/Resources/Resources/.gitignore delete mode 100644 samples/Lua/HelloLua/Resources/Resources/background.mp3.REMOVED.git-id delete mode 100644 samples/Lua/HelloLua/Resources/background.mp3.REMOVED.git-id delete mode 100644 samples/Lua/HelloLua/Resources/farm.jpg.REMOVED.git-id delete mode 100644 samples/Lua/HelloLua/Resources/hello.lua delete mode 100644 samples/Lua/HelloLua/Resources/hello2.lua delete mode 100644 samples/Lua/HelloLua/Resources/mobdebug.lua delete mode 100644 samples/Lua/HelloLua/proj.android/.classpath delete mode 100644 samples/Lua/HelloLua/proj.android/.externalToolBuilders/Javah_jni_builder.launch delete mode 100644 samples/Lua/HelloLua/proj.android/.project delete mode 100644 samples/Lua/HelloLua/proj.android/.settings/org.eclipse.cdt.codan.core.prefs delete mode 100644 samples/Lua/HelloLua/proj.android/AndroidManifest.xml delete mode 100644 samples/Lua/HelloLua/proj.android/ant.properties delete mode 100644 samples/Lua/HelloLua/proj.android/build.xml delete mode 100644 samples/Lua/HelloLua/proj.android/jni/Android.mk delete mode 100644 samples/Lua/HelloLua/proj.android/jni/Application.mk delete mode 100644 samples/Lua/HelloLua/proj.android/jni/hellolua/main.cpp delete mode 100644 samples/Lua/HelloLua/proj.android/proguard-project.txt delete mode 100644 samples/Lua/HelloLua/proj.android/project.properties delete mode 100644 samples/Lua/HelloLua/proj.android/res/values/strings.xml delete mode 100644 samples/Lua/HelloLua/proj.android/src/org/cocos2dx/hellolua/Cocos2dxActivity.java delete mode 100644 samples/Lua/HelloLua/proj.ios/AppController.h delete mode 100644 samples/Lua/HelloLua/proj.ios/AppController.mm delete mode 100644 samples/Lua/HelloLua/proj.ios/Default-568h@2x.png.REMOVED.git-id delete mode 100644 samples/Lua/HelloLua/proj.ios/Default@2x.png.REMOVED.git-id delete mode 100644 samples/Lua/HelloLua/proj.ios/HelloLua_Prefix.pch delete mode 100644 samples/Lua/HelloLua/proj.ios/RootViewController.h delete mode 100644 samples/Lua/HelloLua/proj.ios/RootViewController.mm delete mode 100644 samples/Lua/HelloLua/proj.ios/main.m delete mode 100644 samples/Lua/HelloLua/proj.linux/main.cpp delete mode 100644 samples/Lua/HelloLua/proj.mac/HelloLua_Prefix.pch delete mode 100644 samples/Lua/HelloLua/proj.mac/Icon.icns.REMOVED.git-id delete mode 100644 samples/Lua/HelloLua/proj.mac/en.lproj/InfoPlist.strings delete mode 100644 samples/Lua/HelloLua/proj.mac/en.lproj/MainMenu.xib delete mode 100644 samples/Lua/HelloLua/proj.mac/main.cpp delete mode 100644 samples/Lua/HelloLua/proj.win32/HelloLua.vcxproj delete mode 100644 samples/Lua/HelloLua/proj.win32/HelloLua.vcxproj.filters delete mode 100644 samples/Lua/HelloLua/proj.win32/HelloLua.vcxproj.user delete mode 100644 samples/Lua/HelloLua/proj.win32/main.cpp delete mode 100644 samples/Lua/HelloLua/proj.win32/main.h delete mode 100644 samples/Lua/TestLua/proj.android/.classpath delete mode 100644 samples/Lua/TestLua/proj.android/ant.properties delete mode 100644 samples/Lua/TestLua/proj.android/proguard-project.txt delete mode 100644 samples/Lua/TestLua/proj.android/project.properties delete mode 100644 samples/Lua/TestLua/proj.ios/AppController.h delete mode 100644 samples/Lua/TestLua/proj.ios/Default-568h@2x.png.REMOVED.git-id delete mode 100644 samples/Lua/TestLua/proj.ios/Default@2x.png.REMOVED.git-id delete mode 100644 samples/Lua/TestLua/proj.ios/RootViewController.h delete mode 100644 samples/Lua/TestLua/proj.ios/RootViewController.mm delete mode 100644 samples/Lua/TestLua/proj.mac/Icon.icns.REMOVED.git-id delete mode 100644 samples/Lua/TestLua/proj.mac/en.lproj/InfoPlist.strings delete mode 100644 samples/Lua/TestLua/proj.mac/en.lproj/MainMenu.xib rename samples/{Cpp => }/TestCpp/.cproject (100%) rename samples/{Cpp => }/TestCpp/.externalToolBuilders/Javah_jni_builder.launch (100%) rename samples/{Cpp => }/TestCpp/Android.mk (100%) rename samples/{Cpp => }/TestCpp/CMakeLists.txt (100%) rename samples/{Cpp => }/TestCpp/Classes/AccelerometerTest/AccelerometerTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/AccelerometerTest/AccelerometerTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/ActionManagerTest/ActionManagerTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/ActionManagerTest/ActionManagerTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/ActionsEaseTest/ActionsEaseTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/ActionsEaseTest/ActionsEaseTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/ActionsProgressTest/ActionsProgressTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/ActionsProgressTest/ActionsProgressTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/ActionsTest/ActionsTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/ActionsTest/ActionsTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/AppDelegate.cpp (100%) rename samples/{Cpp/HelloCpp => TestCpp}/Classes/AppDelegate.h (100%) rename samples/{Cpp => }/TestCpp/Classes/BaseTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/BaseTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/Box2DTest/Box2dTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/Box2DTest/Box2dTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/Box2DTestBed/Box2dView.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/Box2DTestBed/Box2dView.h (100%) rename samples/{Cpp => }/TestCpp/Classes/Box2DTestBed/GLES-Render.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/Box2DTestBed/GLES-Render.h (100%) rename samples/{Cpp => }/TestCpp/Classes/Box2DTestBed/Test.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/Box2DTestBed/Test.h (100%) rename samples/{Cpp => }/TestCpp/Classes/Box2DTestBed/TestEntries.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/Box2DTestBed/Tests/AddPair.h (100%) rename samples/{Cpp => }/TestCpp/Classes/Box2DTestBed/Tests/ApplyForce.h (100%) rename samples/{Cpp => }/TestCpp/Classes/Box2DTestBed/Tests/BodyTypes.h (100%) rename samples/{Cpp => }/TestCpp/Classes/Box2DTestBed/Tests/Breakable.h (100%) rename samples/{Cpp => }/TestCpp/Classes/Box2DTestBed/Tests/Bridge.h (100%) rename samples/{Cpp => }/TestCpp/Classes/Box2DTestBed/Tests/BulletTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/Box2DTestBed/Tests/Cantilever.h (100%) rename samples/{Cpp => }/TestCpp/Classes/Box2DTestBed/Tests/Car.h (100%) rename samples/{Cpp => }/TestCpp/Classes/Box2DTestBed/Tests/Chain.h (100%) rename samples/{Cpp => }/TestCpp/Classes/Box2DTestBed/Tests/CharacterCollision.h (100%) rename samples/{Cpp => }/TestCpp/Classes/Box2DTestBed/Tests/CollisionFiltering.h (100%) rename samples/{Cpp => }/TestCpp/Classes/Box2DTestBed/Tests/CollisionProcessing.h (100%) rename samples/{Cpp => }/TestCpp/Classes/Box2DTestBed/Tests/CompoundShapes.h (100%) rename samples/{Cpp => }/TestCpp/Classes/Box2DTestBed/Tests/Confined.h (100%) rename samples/{Cpp => }/TestCpp/Classes/Box2DTestBed/Tests/ContinuousTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/Box2DTestBed/Tests/ConvexHull.h (100%) rename samples/{Cpp => }/TestCpp/Classes/Box2DTestBed/Tests/ConveyorBelt.h (100%) rename samples/{Cpp => }/TestCpp/Classes/Box2DTestBed/Tests/DistanceTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/Box2DTestBed/Tests/Dominos.h (100%) rename samples/{Cpp => }/TestCpp/Classes/Box2DTestBed/Tests/DumpShell.h (100%) rename samples/{Cpp => }/TestCpp/Classes/Box2DTestBed/Tests/DynamicTreeTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/Box2DTestBed/Tests/EdgeShapes.h (100%) rename samples/{Cpp => }/TestCpp/Classes/Box2DTestBed/Tests/EdgeTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/Box2DTestBed/Tests/Gears.h (100%) rename samples/{Cpp => }/TestCpp/Classes/Box2DTestBed/Tests/Mobile.h (100%) rename samples/{Cpp => }/TestCpp/Classes/Box2DTestBed/Tests/MobileBalanced.h (100%) rename samples/{Cpp => }/TestCpp/Classes/Box2DTestBed/Tests/MotorJoint.h (100%) rename samples/{Cpp => }/TestCpp/Classes/Box2DTestBed/Tests/OneSidedPlatform.h (100%) rename samples/{Cpp => }/TestCpp/Classes/Box2DTestBed/Tests/Pinball.h (100%) rename samples/{Cpp => }/TestCpp/Classes/Box2DTestBed/Tests/PolyCollision.h (100%) rename samples/{Cpp => }/TestCpp/Classes/Box2DTestBed/Tests/PolyShapes.h (100%) rename samples/{Cpp => }/TestCpp/Classes/Box2DTestBed/Tests/Prismatic.h (100%) rename samples/{Cpp => }/TestCpp/Classes/Box2DTestBed/Tests/Pulleys.h (100%) rename samples/{Cpp => }/TestCpp/Classes/Box2DTestBed/Tests/Pyramid.h (100%) rename samples/{Cpp => }/TestCpp/Classes/Box2DTestBed/Tests/RayCast.h (100%) rename samples/{Cpp => }/TestCpp/Classes/Box2DTestBed/Tests/Revolute.h (100%) rename samples/{Cpp => }/TestCpp/Classes/Box2DTestBed/Tests/Rope.h (100%) rename samples/{Cpp => }/TestCpp/Classes/Box2DTestBed/Tests/RopeJoint.h (100%) rename samples/{Cpp => }/TestCpp/Classes/Box2DTestBed/Tests/SensorTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/Box2DTestBed/Tests/ShapeEditing.h (100%) rename samples/{Cpp => }/TestCpp/Classes/Box2DTestBed/Tests/SliderCrank.h (100%) rename samples/{Cpp => }/TestCpp/Classes/Box2DTestBed/Tests/SphereStack.h (100%) rename samples/{Cpp => }/TestCpp/Classes/Box2DTestBed/Tests/TheoJansen.h (100%) rename samples/{Cpp => }/TestCpp/Classes/Box2DTestBed/Tests/Tiles.h (100%) rename samples/{Cpp => }/TestCpp/Classes/Box2DTestBed/Tests/TimeOfImpact.h (100%) rename samples/{Cpp => }/TestCpp/Classes/Box2DTestBed/Tests/Tumbler.h (100%) rename samples/{Cpp => }/TestCpp/Classes/Box2DTestBed/Tests/VaryingFriction.h (100%) rename samples/{Cpp => }/TestCpp/Classes/Box2DTestBed/Tests/VaryingRestitution.h (100%) rename samples/{Cpp => }/TestCpp/Classes/Box2DTestBed/Tests/VerticalStack.h (100%) rename samples/{Cpp => }/TestCpp/Classes/Box2DTestBed/Tests/Web.h (100%) rename samples/{Cpp => }/TestCpp/Classes/BugsTest/Bug-1159.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/BugsTest/Bug-1159.h (100%) rename samples/{Cpp => }/TestCpp/Classes/BugsTest/Bug-1174.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/BugsTest/Bug-1174.h (100%) rename samples/{Cpp => }/TestCpp/Classes/BugsTest/Bug-350.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/BugsTest/Bug-350.h (100%) rename samples/{Cpp => }/TestCpp/Classes/BugsTest/Bug-422.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/BugsTest/Bug-422.h (100%) rename samples/{Cpp => }/TestCpp/Classes/BugsTest/Bug-458/Bug-458.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/BugsTest/Bug-458/Bug-458.h (100%) rename samples/{Cpp => }/TestCpp/Classes/BugsTest/Bug-458/QuestionContainerSprite.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/BugsTest/Bug-458/QuestionContainerSprite.h (100%) rename samples/{Cpp => }/TestCpp/Classes/BugsTest/Bug-624.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/BugsTest/Bug-624.h (100%) rename samples/{Cpp => }/TestCpp/Classes/BugsTest/Bug-886.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/BugsTest/Bug-886.h (100%) rename samples/{Cpp => }/TestCpp/Classes/BugsTest/Bug-899.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/BugsTest/Bug-899.h (100%) rename samples/{Cpp => }/TestCpp/Classes/BugsTest/Bug-914.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/BugsTest/Bug-914.h (100%) rename samples/{Cpp => }/TestCpp/Classes/BugsTest/BugsTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/BugsTest/BugsTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/ChipmunkTest/ChipmunkTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/ChipmunkTest/ChipmunkTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/ClickAndMoveTest/ClickAndMoveTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/ClickAndMoveTest/ClickAndMoveTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/ClippingNodeTest/ClippingNodeTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/ClippingNodeTest/ClippingNodeTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/CocosDenshionTest/CocosDenshionTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/CocosDenshionTest/CocosDenshionTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/ConfigurationTest/ConfigurationTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/ConfigurationTest/ConfigurationTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/ConsoleTest/ConsoleTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/ConsoleTest/ConsoleTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/CurlTest/CurlTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/CurlTest/CurlTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/CurrentLanguageTest/CurrentLanguageTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/CurrentLanguageTest/CurrentLanguageTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/DataVisitorTest/DataVisitorTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/DataVisitorTest/DataVisitorTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/DrawPrimitivesTest/DrawPrimitivesTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/DrawPrimitivesTest/DrawPrimitivesTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/EffectsAdvancedTest/EffectsAdvancedTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/EffectsAdvancedTest/EffectsAdvancedTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/EffectsTest/EffectsTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/EffectsTest/EffectsTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.h (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/ComponentsTestScene.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/ComponentsTestScene.h (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/EnemyController.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/EnemyController.h (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/GameOverScene.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/GameOverScene.h (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/PlayerController.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/PlayerController.h (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/ProjectileController.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/ProjectileController.h (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/SceneController.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/SceneController.h (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/CocosGUIScene.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/CocosGUIScene.h (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILabelAtlasTest/UILabelAtlasTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILabelAtlasTest/UILabelAtlasTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILabelBMFontTest/UILabelBMFontTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILabelBMFontTest/UILabelBMFontTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILabelTest/UILabelTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILabelTest/UILabelTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIListViewTest/UIListViewTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIListViewTest/UIListViewTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIScene.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIScene.h (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UISceneManager.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UISceneManager.h (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UISliderTest/UISliderTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UISliderTest/UISliderTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/EventDef.h (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/acts.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/acts.h (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/cons.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/cons.h (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsLayerLoader.h (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsTestLayer.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsTestLayer.h (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayer.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayer.h (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayerLoader.h (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/CocosBuilderTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/CocosBuilderTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayer.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayer.h (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayerLoader.h (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/LabelTest/LabelTestLayer.h (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/LabelTest/LabelTestLayerLoader.h (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayer.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayer.h (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayerLoader.h (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/ParticleSystemTest/ParticleSystemTestLayer.h (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/ParticleSystemTest/ParticleSystemTestLayerLoader.h (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/ScrollViewTest/ScrollViewTestLayer.h (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/ScrollViewTest/ScrollViewTestLayerLoader.h (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/SpriteTest/SpriteTestLayer.h (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/SpriteTest/SpriteTestLayerLoader.h (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayer.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayer.h (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayerLoader.h (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackLayerLoader.h (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackTestLayer.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackTestLayer.h (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlButtonTest/CCControlButtonTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlButtonTest/CCControlButtonTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlColourPicker/CCControlColourPickerTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlColourPicker/CCControlColourPickerTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlPotentiometerTest/CCControlPotentiometerTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlPotentiometerTest/CCControlPotentiometerTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlScene.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlScene.h (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSceneManager.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSceneManager.h (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSliderTest/CCControlSliderTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSliderTest/CCControlSliderTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlStepperTest/CCControlStepperTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlStepperTest/CCControlStepperTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSwitchTest/CCControlSwitchTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSwitchTest/CCControlSwitchTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/EditBoxTest/EditBoxTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/EditBoxTest/EditBoxTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/ExtensionsTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/ExtensionsTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/NetworkTest/HttpClientTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/NetworkTest/HttpClientTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/NetworkTest/SocketIOTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/NetworkTest/SocketIOTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/NetworkTest/WebSocketTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/NetworkTest/WebSocketTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/NotificationCenterTest/NotificationCenterTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/NotificationCenterTest/NotificationCenterTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/Scale9SpriteTest/Scale9SpriteTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/Scale9SpriteTest/Scale9SpriteTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/TableViewTest/CustomTableViewCell.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/TableViewTest/CustomTableViewCell.h (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/TableViewTest/TableViewTestScene.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/ExtensionsTest/TableViewTest/TableViewTestScene.h (100%) rename samples/{Cpp => }/TestCpp/Classes/FileUtilsTest/FileUtilsTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/FileUtilsTest/FileUtilsTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/FontTest/FontTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/FontTest/FontTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/InputTest/MouseTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/InputTest/MouseTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/IntervalTest/IntervalTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/IntervalTest/IntervalTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/KeyboardTest/KeyboardTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/KeyboardTest/KeyboardTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/KeypadTest/KeypadTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/KeypadTest/KeypadTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/LabelTest/LabelTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/LabelTest/LabelTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/LabelTest/LabelTestNew.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/LabelTest/LabelTestNew.h (100%) rename samples/{Cpp => }/TestCpp/Classes/LayerTest/LayerTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/LayerTest/LayerTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/MenuTest/MenuTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/MenuTest/MenuTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/MotionStreakTest/MotionStreakTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/MotionStreakTest/MotionStreakTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/MutiTouchTest/MutiTouchTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/MutiTouchTest/MutiTouchTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/NewEventDispatcherTest/NewEventDispatcherTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/NewEventDispatcherTest/NewEventDispatcherTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/NewRendererTest/NewRendererTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/NewRendererTest/NewRendererTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/NodeTest/NodeTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/NodeTest/NodeTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/ParallaxTest/ParallaxTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/ParallaxTest/ParallaxTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/ParticleTest/ParticleTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/ParticleTest/ParticleTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/PerformanceTest/PerformanceAllocTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/PerformanceTest/PerformanceAllocTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/PerformanceTest/PerformanceContainerTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/PerformanceTest/PerformanceContainerTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/PerformanceTest/PerformanceEventDispatcherTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/PerformanceTest/PerformanceEventDispatcherTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/PerformanceTest/PerformanceLabelTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/PerformanceTest/PerformanceLabelTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/PerformanceTest/PerformanceNodeChildrenTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/PerformanceTest/PerformanceNodeChildrenTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/PerformanceTest/PerformanceParticleTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/PerformanceTest/PerformanceParticleTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/PerformanceTest/PerformanceRendererTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/PerformanceTest/PerformanceRendererTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/PerformanceTest/PerformanceSpriteTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/PerformanceTest/PerformanceSpriteTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/PerformanceTest/PerformanceTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/PerformanceTest/PerformanceTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/PerformanceTest/PerformanceTextureTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/PerformanceTest/PerformanceTextureTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/PerformanceTest/PerformanceTouchesTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/PerformanceTest/PerformanceTouchesTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/PhysicsTest/PhysicsTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/PhysicsTest/PhysicsTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/ReleasePoolTest/ReleasePoolTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/ReleasePoolTest/ReleasePoolTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/RenderTextureTest/RenderTextureTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/RenderTextureTest/RenderTextureTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/RotateWorldTest/RotateWorldTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/RotateWorldTest/RotateWorldTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/SceneTest/SceneTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/SceneTest/SceneTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/SchedulerTest/SchedulerTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/SchedulerTest/SchedulerTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/ShaderTest/ShaderTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/ShaderTest/ShaderTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/ShaderTest/ShaderTest2.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/ShaderTest/ShaderTest2.h (100%) rename samples/{Cpp => }/TestCpp/Classes/SpineTest/SpineTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/SpineTest/SpineTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/SpriteTest/SpriteTest.cpp.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Classes/SpriteTest/SpriteTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/TextInputTest/TextInputTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/TextInputTest/TextInputTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/Texture2dTest/Texture2dTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/Texture2dTest/Texture2dTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/TextureCacheTest/TextureCacheTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/TextureCacheTest/TextureCacheTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/TexturePackerEncryptionTest/TextureAtlasEncryptionTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/TexturePackerEncryptionTest/TextureAtlasEncryptionTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/TileMapTest/TileMapTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/TileMapTest/TileMapTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/TouchesTest/Ball.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/TouchesTest/Ball.h (100%) rename samples/{Cpp => }/TestCpp/Classes/TouchesTest/Paddle.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/TouchesTest/Paddle.h (100%) rename samples/{Cpp => }/TestCpp/Classes/TouchesTest/TouchesTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/TouchesTest/TouchesTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/TransitionsTest/TransitionsTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/TransitionsTest/TransitionsTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/UnitTest/UnitTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/UnitTest/UnitTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/UserDefaultTest/UserDefaultTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/UserDefaultTest/UserDefaultTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/VisibleRect.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/VisibleRect.h (100%) rename samples/{Cpp => }/TestCpp/Classes/ZwoptexTest/ZwoptexTest.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/ZwoptexTest/ZwoptexTest.h (100%) rename samples/{Cpp => }/TestCpp/Classes/controller.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/controller.h (100%) rename samples/{Cpp => }/TestCpp/Classes/testBasic.cpp (100%) rename samples/{Cpp => }/TestCpp/Classes/testBasic.h (100%) rename samples/{Cpp => }/TestCpp/Classes/testResource.h (100%) rename samples/{Cpp => }/TestCpp/Classes/tests.h (100%) rename samples/{Cpp/HelloCpp => TestCpp}/Resources/.gitignore (100%) rename samples/{Cpp => }/TestCpp/Resources/Hello.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/Images/HelloWorld.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/Images/PlanetCute-1024x1024.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/Images/atlastest.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/Images/background1.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/Images/background2.jpg.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/Images/background2.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/Images/bugs/bug886.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/Images/grossini_dance_atlas-mono.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/Images/landscape-1024x1024.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/Images/noise.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/Images/spritesheet1.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/Images/stone.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/Images/test_1021x1024.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/Images/test_1021x1024_a8.pvr.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/Images/test_1021x1024_rgb888.pvr.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/Images/test_1021x1024_rgb888.pvr.gz.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/Images/test_1021x1024_rgba4444.pvr.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/Images/test_1021x1024_rgba4444.pvr.gz.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/Images/test_1021x1024_rgba8888.pvr.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/Images/test_1021x1024_rgba8888.pvr.gz.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/Misc/resources-hd/test4.txt (100%) rename samples/{Cpp => }/TestCpp/Resources/Misc/resources-ipad/test2.txt (100%) rename samples/{Cpp => }/TestCpp/Resources/Misc/resources-ipadhd/test1.txt (100%) rename samples/{Cpp => }/TestCpp/Resources/Misc/resources-iphone/test6.txt (100%) rename samples/{Cpp => }/TestCpp/Resources/Misc/resources-mac/test2.txt (100%) rename samples/{Cpp => }/TestCpp/Resources/Misc/resources-machd/test1.txt (100%) rename samples/{Cpp => }/TestCpp/Resources/Misc/resources-wide/test5.txt (100%) rename samples/{Cpp => }/TestCpp/Resources/Misc/resources-widehd/test3.txt (100%) rename samples/{Cpp => }/TestCpp/Resources/Misc/searchpath1/file1.txt (100%) rename samples/{Cpp => }/TestCpp/Resources/Misc/searchpath2/resources-ipad/file2.txt (100%) rename samples/{Cpp => }/TestCpp/Resources/Shaders/example_ColorBars.vsh (100%) rename samples/{Cpp => }/TestCpp/Resources/Shaders/example_Flower.vsh (100%) rename samples/{Cpp => }/TestCpp/Resources/Shaders/example_Heart.vsh (100%) rename samples/{Cpp => }/TestCpp/Resources/Shaders/example_Julia.vsh (100%) rename samples/{Cpp => }/TestCpp/Resources/Shaders/example_Mandelbrot.vsh (100%) rename samples/{Cpp => }/TestCpp/Resources/Shaders/example_Monjori.vsh (100%) rename samples/{Cpp => }/TestCpp/Resources/Shaders/example_Plasma.vsh (100%) rename samples/{Cpp => }/TestCpp/Resources/Shaders/example_Twist.vsh (100%) rename samples/{Cpp => }/TestCpp/Resources/TileMaps/hexa-tiles.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/TileMaps/map/slcj.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/TileMaps/ortho-test1.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/TileMaps/ortho-test1_bw.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/animations/grossini.plist.xml (100%) rename samples/{Cpp => }/TestCpp/Resources/armature/Cowboy.ExportJson.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/armature/Cowboy0.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/armature/Dragon.xml (100%) rename samples/{Cpp => }/TestCpp/Resources/armature/HeroAnimation.ExportJson.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/armature/cyborg.xml (100%) rename samples/{Cpp => }/TestCpp/Resources/armature/knight.xml (100%) rename samples/{Cpp => }/TestCpp/Resources/armature/robot.xml (100%) rename samples/{Cpp => }/TestCpp/Resources/armature/weapon.xml (100%) rename samples/{Cpp/SimpleGame => TestCpp}/Resources/background-music-aac.wav.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/background.mp3.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/ccb/flower.jpg.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/ccb/gem-0.wav.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/ccb/gem-1.wav.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/ccb/markerfelt24shadow.fnt.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/cocosgui/Hello.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/cocosgui/UITest/background.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/cocosgui/b11.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/cocosgui/bitmapFontTest2.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/cocosgui/examples/examples.json.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/cocosgui/gui_examples/map_1/map_pve.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/cocosgui/gui_examples/page_1/background.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/extensions/background.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/fonts/Courier New.ttf.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/fonts/Thonburi.ttf.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/fonts/ThonburiBold.ttf.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/fonts/arial-26-en-ru_0.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/fonts/arial-unicode-26.GlyphProject (100%) rename samples/{Cpp => }/TestCpp/Resources/fonts/arial-unicode-26.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/fonts/arial.ttf.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/fonts/bitmapFontChinese.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/fonts/bitmapFontTest.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/fonts/bitmapFontTest2.bmp.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/fonts/bitmapFontTest2.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/fonts/boundsTestFont.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/fonts/font-issue1343-hd.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/fonts/futura-48.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/fonts/helvetica-geneva-32.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/fonts/markerFelt.fnt.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/fonts/strings.xml (100%) rename samples/{Cpp => }/TestCpp/Resources/fonts/tahoma.ttf.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/fonts/wt021.ttf.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/hd/Images/background1.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/hd/Images/background2.jpg.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/hd/Images/background2.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/hd/armature/Cowboy0.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/hd/armature/Dragon.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/hd/armature/HeroAnimation0.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/hd/armature/weapon.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/hd/ccb/burst.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/hd/cocosgui/Hello.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/hd/cocosgui/UITest/background.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/hd/cocosgui/b11.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/hd/cocosgui/bitmapFontTest2.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/hd/cocosgui/examples/examples.json.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/hd/cocosgui/gui_examples/map_1/map_pve.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/hd/cocosgui/gui_examples/page_1/background.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/hd/extensions/background.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/hd/fonts/font-issue1343.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/hd/fonts/markerFelt.fnt.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/hd/fonts/markerFelt.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/hd/fonts/tuffy_bold_italic-charmap.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/hd/scenetest/ArmatureComponentTest/Images/startMenuBG.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/hd/scenetest/ArmatureComponentTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/hd/scenetest/ArmatureComponentTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/hd/scenetest/BackgroundComponentTest/Images/startMenuBG.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/hd/scenetest/BackgroundComponentTest/Misc/music_logo.mp3.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/hd/scenetest/BackgroundComponentTest/Misc/music_logo.wav.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/hd/scenetest/BackgroundComponentTest/startMenu/Fish_UI/starMenuButton01.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/hd/scenetest/BackgroundComponentTest/startMenu/Fish_UI/starMenuButton02.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/hd/scenetest/BackgroundComponentTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/hd/scenetest/EffectComponentTest/CowBoy/Cowboy.ExportJson.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/hd/scenetest/EffectComponentTest/CowBoy/Cowboy0.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/Images/startMenuBG.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.mp3.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.wav.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/starMenuButton01.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/starMenuButton02.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/hd/scenetest/TriggerTest/Images/startMenuBG.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/hd/scenetest/TriggerTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/hd/scenetest/TriggerTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/hd/scenetest/UIComponentTest/Images/startMenuBG.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/hd/scenetest/UIComponentTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/hd/scenetest/UIComponentTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/hd/spine/goblins.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/hd/spine/spineboy.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/ipad/ccb/burst.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/ipad/extensions/background.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/scenetest/ArmatureComponentTest/Images/startMenuBG.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/scenetest/ArmatureComponentTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/scenetest/ArmatureComponentTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/scenetest/BackgroundComponentTest/Images/startMenuBG.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/scenetest/BackgroundComponentTest/Misc/music_logo.mp3.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/scenetest/BackgroundComponentTest/Misc/music_logo.wav.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/scenetest/BackgroundComponentTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/scenetest/EffectComponentTest/CowBoy/Cowboy.ExportJson.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/scenetest/EffectComponentTest/CowBoy/Cowboy0.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/scenetest/LoadSceneEdtiorFileTest/Images/startMenuBG.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.mp3.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.wav.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/scenetest/LoadSceneEdtiorFileTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/scenetest/LoadSceneEdtiorFileTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/scenetest/TriggerTest/Images/startMenuBG.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/scenetest/TriggerTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/scenetest/TriggerTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/scenetest/UIComponentTest/Images/startMenuBG.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/scenetest/UIComponentTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/scenetest/UIComponentTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/Resources/spine/goblins.png.REMOVED.git-id (100%) rename samples/{Cpp/HelloCpp => TestCpp}/proj.android/.classpath (100%) rename samples/{Cpp => }/TestCpp/proj.android/.externalToolBuilders/Javah_jni_builder.launch (100%) rename samples/{Cpp => }/TestCpp/proj.android/.project (100%) rename samples/{Cpp/AssetsManagerTest => TestCpp}/proj.android/.settings/org.eclipse.cdt.codan.core.prefs (100%) rename samples/{Cpp => }/TestCpp/proj.android/AndroidManifest.xml (100%) rename samples/{Cpp/AssetsManagerTest => TestCpp}/proj.android/README.md (100%) rename samples/{Cpp/AssetsManagerTest => TestCpp}/proj.android/ant.properties (100%) rename samples/{Cpp => }/TestCpp/proj.android/build.xml (100%) rename samples/{Cpp => }/TestCpp/proj.android/jni/Android.mk (100%) rename samples/{Cpp => }/TestCpp/proj.android/jni/Application.mk (100%) rename samples/{Cpp => }/TestCpp/proj.android/jni/testcpp/main.cpp (100%) rename samples/{Cpp => }/TestCpp/proj.android/ndkgdb.sh (100%) rename samples/{Cpp/AssetsManagerTest => TestCpp}/proj.android/proguard-project.txt (100%) rename samples/{Cpp/HelloCpp => TestCpp}/proj.android/project.properties (100%) rename samples/{Cpp => }/TestCpp/proj.android/res/values/strings.xml (100%) rename samples/{Cpp => }/TestCpp/proj.android/src/nojava.txt (100%) rename samples/{Cpp => }/TestCpp/proj.android/src/org/cocos2dx/testcpp/Cocos2dxActivity.java (100%) rename samples/{Cpp => }/TestCpp/proj.ios/Classes/RootViewController.h (100%) rename samples/{Cpp => }/TestCpp/proj.ios/Classes/RootViewController.mm (100%) rename samples/{Cpp => }/TestCpp/proj.ios/Classes/testsAppDelegate.h (100%) rename samples/{Cpp => }/TestCpp/proj.ios/Classes/testsAppDelegate.mm (100%) rename samples/{Cpp/HelloCpp => TestCpp}/proj.ios/Default-568h@2x.png.REMOVED.git-id (100%) rename samples/{Cpp/HelloCpp => TestCpp}/proj.ios/Default@2x.png.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/proj.ios/iphone_Prefix.pch (100%) rename samples/{Cpp => }/TestCpp/proj.ios/main.m (100%) rename samples/{Cpp => }/TestCpp/proj.linux/main.cpp (100%) rename samples/{Cpp/HelloCpp => TestCpp}/proj.mac/Icon.icns.REMOVED.git-id (100%) rename samples/{Cpp => }/TestCpp/proj.mac/Test_Prefix.pch (100%) rename samples/{Cpp/HelloCpp => TestCpp}/proj.mac/en.lproj/InfoPlist.strings (100%) rename samples/{Cpp => }/TestCpp/proj.mac/en.lproj/MainMenu.xib (100%) rename samples/{Cpp => }/TestCpp/proj.mac/main.cpp (100%) rename samples/{Cpp => }/TestCpp/proj.win32/TestCpp.vcxproj (100%) rename samples/{Cpp => }/TestCpp/proj.win32/TestCpp.vcxproj.filters (100%) rename samples/{Cpp => }/TestCpp/proj.win32/TestCpp.vcxproj.user (100%) rename samples/{Cpp => }/TestCpp/proj.win32/main.cpp (100%) rename samples/{Cpp/HelloCpp => TestCpp}/proj.win32/main.h (100%) rename samples/{Javascript => }/TestJavascript/Classes/AppDelegate.cpp (100%) rename samples/{Javascript/CocosDragonJS => TestJavascript}/Classes/AppDelegate.h (100%) rename samples/{Cpp/AssetsManagerTest => TestJavascript}/proj.android/.classpath (100%) rename samples/{Javascript => }/TestJavascript/proj.android/.project (100%) rename samples/{Javascript => }/TestJavascript/proj.android/.settings/.jsdtscope (100%) rename samples/{Cpp/HelloCpp => TestJavascript}/proj.android/.settings/org.eclipse.cdt.codan.core.prefs (100%) rename samples/{Javascript => }/TestJavascript/proj.android/.settings/org.eclipse.wst.jsdt.ui.prefs (100%) rename samples/{Javascript => }/TestJavascript/proj.android/.settings/org.eclipse.wst.jsdt.ui.superType.container (100%) rename samples/{Javascript => }/TestJavascript/proj.android/.settings/org.eclipse.wst.jsdt.ui.superType.name (100%) rename samples/{Javascript => }/TestJavascript/proj.android/AndroidManifest.xml (100%) rename samples/{Cpp/HelloCpp => TestJavascript}/proj.android/README.md (100%) rename samples/{Javascript/CocosDragonJS => TestJavascript}/proj.android/ant.properties (100%) rename samples/{Javascript => }/TestJavascript/proj.android/build.xml (100%) rename samples/{Javascript => }/TestJavascript/proj.android/jni/Android.mk (100%) rename samples/{Javascript/MoonWarriors => TestJavascript}/proj.android/jni/Application.mk (100%) rename samples/{Javascript/CocosDragonJS/proj.android/jni/cocosdragonjs => TestJavascript/proj.android/jni/testjavascript}/main.cpp (100%) rename samples/{Javascript => }/TestJavascript/proj.android/ndkgdb.sh (100%) rename samples/{Cpp/SimpleGame => TestJavascript}/proj.android/proguard-project.txt (100%) rename samples/{Cpp/TestCpp => TestJavascript}/proj.android/project.properties (100%) rename samples/{Javascript => }/TestJavascript/proj.android/res/values/strings.xml (100%) rename samples/{Javascript => }/TestJavascript/proj.android/src/org/cocos2dx/testjavascript/Cocos2dxActivity.java (100%) rename samples/{Javascript/CocosDragonJS => TestJavascript}/proj.ios/AppController.h (100%) rename samples/{Javascript => }/TestJavascript/proj.ios/AppController.mm (100%) rename samples/{Cpp/SimpleGame => TestJavascript}/proj.ios/Default-568h@2x.png.REMOVED.git-id (100%) rename samples/{Cpp/SimpleGame => TestJavascript}/proj.ios/Default@2x.png.REMOVED.git-id (100%) rename samples/{Javascript/CocosDragonJS => TestJavascript}/proj.ios/Prefix.pch (100%) rename samples/{Cpp/HelloCpp => TestJavascript}/proj.ios/RootViewController.h (100%) rename samples/{Javascript/CocosDragonJS => TestJavascript}/proj.ios/RootViewController.mm (100%) rename samples/{Javascript/CocosDragonJS => TestJavascript}/proj.ios/main.m (100%) rename samples/{Cpp/SimpleGame => TestJavascript}/proj.mac/Icon.icns.REMOVED.git-id (100%) rename samples/{Javascript => }/TestJavascript/proj.mac/Test_Prefix.pch (100%) rename samples/{Cpp/SimpleGame => TestJavascript}/proj.mac/en.lproj/InfoPlist.strings (100%) rename samples/{Javascript/CocosDragonJS => TestJavascript}/proj.mac/en.lproj/MainMenu.xib (100%) rename samples/{Javascript => }/TestJavascript/proj.mac/main.cpp (100%) rename samples/{Javascript => }/TestJavascript/proj.win32/TestJavascript.vcxproj (100%) rename samples/{Javascript => }/TestJavascript/proj.win32/TestJavascript.vcxproj.filters (100%) rename samples/{Javascript => }/TestJavascript/proj.win32/TestJavascript.vcxproj.user (100%) rename samples/{Javascript => }/TestJavascript/proj.win32/main.cpp (100%) rename samples/{Cpp/AssetsManagerTest => TestJavascript}/proj.win32/main.h (100%) rename samples/{Javascript/CocosDragonJS => TestJavascript}/proj.win32/res/testjs.ico (100%) rename samples/{Cpp/AssetsManagerTest => TestJavascript}/proj.win32/resource.h (100%) rename samples/{Javascript/CocosDragonJS => TestJavascript}/proj.win32/testjs.rc (100%) rename samples/{Lua => }/TestLua/.gitignore (100%) rename samples/{Lua => }/TestLua/CMakeLists.txt (100%) rename samples/{Lua => }/TestLua/Classes/AppDelegate.cpp (100%) rename samples/{Lua => }/TestLua/Classes/AppDelegate.h (100%) rename samples/{Lua => }/TestLua/Classes/lua_assetsmanager_test_sample.cpp (100%) rename samples/{Lua => }/TestLua/Classes/lua_assetsmanager_test_sample.h (100%) rename samples/{Lua => }/TestLua/Resources/cocosbuilderRes/ccb/flower.jpg.REMOVED.git-id (100%) rename samples/{Lua => }/TestLua/Resources/cocosbuilderRes/ccb/gem-0.wav.REMOVED.git-id (100%) rename samples/{Lua => }/TestLua/Resources/cocosbuilderRes/ccb/gem-1.wav.REMOVED.git-id (100%) rename samples/{Lua => }/TestLua/Resources/cocosbuilderRes/ccb/markerfelt24shadow.fnt.REMOVED.git-id (100%) rename samples/{Lua => }/TestLua/Resources/luaScript/AccelerometerTest/AccelerometerTest.lua (100%) rename samples/{Lua => }/TestLua/Resources/luaScript/ActionManagerTest/ActionManagerTest.lua (100%) rename samples/{Lua => }/TestLua/Resources/luaScript/ActionsEaseTest/ActionsEaseTest.lua (100%) rename samples/{Lua => }/TestLua/Resources/luaScript/ActionsProgressTest/ActionsProgressTest.lua (100%) rename samples/{Lua => }/TestLua/Resources/luaScript/ActionsTest/ActionsTest.lua (100%) rename samples/{Lua => }/TestLua/Resources/luaScript/AssetsManagerTest/AssetsManagerModule.lua (100%) rename samples/{Lua => }/TestLua/Resources/luaScript/AssetsManagerTest/AssetsManagerTest.lua (100%) rename samples/{Lua => }/TestLua/Resources/luaScript/BugsTest/BugsTest.lua (100%) rename samples/{Lua => }/TestLua/Resources/luaScript/ClickAndMoveTest/ClickAndMoveTest.lua (100%) rename samples/{Lua => }/TestLua/Resources/luaScript/CocoStudioTest/CocoStudioArmatureTest/CocoStudioArmatureTest.lua (100%) rename samples/{Lua => }/TestLua/Resources/luaScript/CocoStudioTest/CocoStudioGUITest/CocoStudioGUITest.lua.REMOVED.git-id (100%) rename samples/{Lua => }/TestLua/Resources/luaScript/CocoStudioTest/CocoStudioSceneTest/CocoStudioSceneTest.lua (100%) rename samples/{Lua => }/TestLua/Resources/luaScript/CocoStudioTest/CocoStudioSceneTest/TriggerCode/acts.lua (100%) rename samples/{Lua => }/TestLua/Resources/luaScript/CocoStudioTest/CocoStudioSceneTest/TriggerCode/cons.lua (100%) rename samples/{Lua => }/TestLua/Resources/luaScript/CocoStudioTest/CocoStudioSceneTest/TriggerCode/eventDef.lua (100%) rename samples/{Lua => }/TestLua/Resources/luaScript/CocoStudioTest/CocoStudioTest.lua (100%) rename samples/{Lua => }/TestLua/Resources/luaScript/CocosDenshionTest/CocosDenshionTest.lua (100%) rename samples/{Lua => }/TestLua/Resources/luaScript/CurrentLanguageTest/CurrentLanguageTest.lua (100%) rename samples/{Lua => }/TestLua/Resources/luaScript/DrawPrimitivesTest/DrawPrimitivesTest.lua (100%) rename samples/{Lua => }/TestLua/Resources/luaScript/EffectsAdvancedTest/EffectsAdvancedTest.lua (100%) rename samples/{Lua => }/TestLua/Resources/luaScript/EffectsTest/EffectsName.lua (100%) rename samples/{Lua => }/TestLua/Resources/luaScript/EffectsTest/EffectsTest.lua (100%) rename samples/{Lua => }/TestLua/Resources/luaScript/ExtensionTest/CocosBuilderTest.lua (100%) rename samples/{Lua => }/TestLua/Resources/luaScript/ExtensionTest/ExtensionTest.lua (100%) rename samples/{Lua => }/TestLua/Resources/luaScript/ExtensionTest/WebProxyTest.lua (100%) rename samples/{Lua => }/TestLua/Resources/luaScript/FontTest/FontTest.lua (100%) rename samples/{Lua => }/TestLua/Resources/luaScript/IntervalTest/IntervalTest.lua (100%) rename samples/{Lua => }/TestLua/Resources/luaScript/KeypadTest/KeypadTest.lua (100%) rename samples/{Lua => }/TestLua/Resources/luaScript/LabelTest/LabelTest.lua (100%) rename samples/{Lua => }/TestLua/Resources/luaScript/LabelTestNew/LabelTestNew.lua (100%) rename samples/{Lua => }/TestLua/Resources/luaScript/LayerTest/LayerTest.lua (100%) rename samples/{Lua => }/TestLua/Resources/luaScript/LuaBridgeTest/LuaBridgeTest.lua (100%) rename samples/{Lua => }/TestLua/Resources/luaScript/MenuTest/MenuTest.lua (100%) rename samples/{Lua => }/TestLua/Resources/luaScript/MotionStreakTest/MotionStreakTest.lua (100%) rename samples/{Lua => }/TestLua/Resources/luaScript/NewEventDispatcherTest/NewEventDispatcherTest.lua (100%) rename samples/{Lua => }/TestLua/Resources/luaScript/NodeTest/NodeTest.lua (100%) rename samples/{Lua => }/TestLua/Resources/luaScript/OpenGLTest/OpenGLTest.lua (100%) rename samples/{Lua => }/TestLua/Resources/luaScript/ParallaxTest/ParallaxTest.lua (100%) rename samples/{Lua => }/TestLua/Resources/luaScript/ParticleTest/ParticleTest.lua (100%) rename samples/{Lua => }/TestLua/Resources/luaScript/PerformanceTest/PerformanceSpriteTest.lua (100%) rename samples/{Lua => }/TestLua/Resources/luaScript/PerformanceTest/PerformanceTest.lua (100%) rename samples/{Lua => }/TestLua/Resources/luaScript/PhysicsTest/PhysicsTest.lua (100%) rename samples/{Lua => }/TestLua/Resources/luaScript/RenderTextureTest/RenderTextureTest.lua (100%) rename samples/{Lua => }/TestLua/Resources/luaScript/RotateWorldTest/RotateWorldTest.lua (100%) rename samples/{Lua => }/TestLua/Resources/luaScript/SceneTest/SceneTest.lua (100%) rename samples/{Lua => }/TestLua/Resources/luaScript/SpineTest/SpineTest.lua (100%) rename samples/{Lua => }/TestLua/Resources/luaScript/SpriteTest/SpriteTest.lua (100%) rename samples/{Lua => }/TestLua/Resources/luaScript/Texture2dTest/Texture2dTest.lua (100%) rename samples/{Lua => }/TestLua/Resources/luaScript/TileMapTest/TileMapTest.lua (100%) rename samples/{Lua => }/TestLua/Resources/luaScript/TouchesTest/Ball.lua (100%) rename samples/{Lua => }/TestLua/Resources/luaScript/TouchesTest/Paddle.lua (100%) rename samples/{Lua => }/TestLua/Resources/luaScript/TouchesTest/TouchesTest.lua (100%) rename samples/{Lua => }/TestLua/Resources/luaScript/TransitionsTest/TransitionsName.lua (100%) rename samples/{Lua => }/TestLua/Resources/luaScript/TransitionsTest/TransitionsTest.lua (100%) rename samples/{Lua => }/TestLua/Resources/luaScript/UserDefaultTest/UserDefaultTest.lua (100%) rename samples/{Lua => }/TestLua/Resources/luaScript/VisibleRect.lua (100%) rename samples/{Lua => }/TestLua/Resources/luaScript/XMLHttpRequestTest/XMLHttpRequestTest.lua (100%) rename samples/{Lua => }/TestLua/Resources/luaScript/ZwoptexTest/ZwoptexTest.lua (100%) rename samples/{Lua => }/TestLua/Resources/luaScript/controller.lua (100%) rename samples/{Lua => }/TestLua/Resources/luaScript/helper.lua (100%) rename samples/{Lua => }/TestLua/Resources/luaScript/mainMenu.lua (100%) rename samples/{Lua => }/TestLua/Resources/luaScript/testResource.lua (100%) rename samples/{Javascript/CocosDragonJS => TestLua}/proj.android/.classpath (100%) rename samples/{Lua => }/TestLua/proj.android/.project (100%) rename samples/{Lua => }/TestLua/proj.android/AndroidManifest.xml (100%) rename samples/{Cpp/SimpleGame => TestLua}/proj.android/ant.properties (100%) rename samples/{Lua => }/TestLua/proj.android/build.xml (100%) rename samples/{Lua => }/TestLua/proj.android/jni/Android.mk (100%) rename samples/{Lua => }/TestLua/proj.android/jni/Application.mk (100%) rename samples/{Lua => }/TestLua/proj.android/jni/testlua/main.cpp (100%) rename samples/{Cpp/TestCpp => TestLua}/proj.android/proguard-project.txt (100%) rename samples/{Javascript/CocosDragonJS => TestLua}/proj.android/project.properties (100%) rename samples/{Lua => }/TestLua/proj.android/res/values/strings.xml (100%) rename samples/{Lua => }/TestLua/proj.android/src/com/cocos2dx/sample/LuaJavaBridgeTest/LuaJavaBridgeTest.java (100%) rename samples/{Lua => }/TestLua/proj.android/src/org/cocos2dx/testlua/Cocos2dxActivity.java (100%) rename samples/{Cpp/HelloCpp => TestLua}/proj.ios/AppController.h (100%) rename samples/{Lua => }/TestLua/proj.ios/AppController.mm (100%) rename samples/{Cpp/TestCpp => TestLua}/proj.ios/Default-568h@2x.png.REMOVED.git-id (100%) rename samples/{Cpp/TestCpp => TestLua}/proj.ios/Default@2x.png.REMOVED.git-id (100%) rename samples/{Lua => }/TestLua/proj.ios/LuaObjectCBridgeTest.h (100%) rename samples/{Lua => }/TestLua/proj.ios/LuaObjectCBridgeTest.mm (100%) rename samples/{Cpp/SimpleGame => TestLua}/proj.ios/RootViewController.h (100%) rename samples/{Cpp/SimpleGame => TestLua}/proj.ios/RootViewController.mm (100%) rename samples/{Lua => }/TestLua/proj.ios/TestLua_Prefix.pch (100%) rename samples/{Lua => }/TestLua/proj.ios/main.m (100%) rename samples/{Lua => }/TestLua/proj.linux/main.cpp (100%) rename samples/{Cpp/TestCpp => TestLua}/proj.mac/Icon.icns.REMOVED.git-id (100%) rename samples/{Lua => }/TestLua/proj.mac/LuaObjectCBridgeTest.h (100%) rename samples/{Lua => }/TestLua/proj.mac/LuaObjectCBridgeTest.mm (100%) rename samples/{Lua => }/TestLua/proj.mac/TestLua_Prefix.pch (100%) rename samples/{Cpp/TestCpp => TestLua}/proj.mac/en.lproj/InfoPlist.strings (100%) rename samples/{Cpp/HelloCpp => TestLua}/proj.mac/en.lproj/MainMenu.xib (100%) rename samples/{Lua => }/TestLua/proj.mac/main.cpp (100%) rename samples/{Lua => }/TestLua/proj.win32/TestLua.rc (100%) rename samples/{Lua => }/TestLua/proj.win32/TestLua.win32.vcxproj (100%) rename samples/{Lua => }/TestLua/proj.win32/TestLua.win32.vcxproj.filters (100%) rename samples/{Lua => }/TestLua/proj.win32/TestLua.win32.vcxproj.user (100%) rename samples/{Lua => }/TestLua/proj.win32/main.cpp (100%) rename samples/{Lua => }/TestLua/proj.win32/main.h (100%) rename samples/{Lua => }/TestLua/proj.win32/res/TestLua.ico (100%) rename samples/{Lua => }/TestLua/proj.win32/resource.h (100%) diff --git a/samples/Cpp/AssetsManagerTest/Classes/AppDelegate.cpp b/samples/Cpp/AssetsManagerTest/Classes/AppDelegate.cpp deleted file mode 100644 index 3d6ed9ec1a..0000000000 --- a/samples/Cpp/AssetsManagerTest/Classes/AppDelegate.cpp +++ /dev/null @@ -1,221 +0,0 @@ -// -// AssetsManagerTestAppDelegate.cpp -// AssetsManagerTest -// - -#include "AppDelegate.h" - -#include "cocos2d.h" -#include "SimpleAudioEngine.h" -#include "ScriptingCore.h" -#include "jsb_cocos2dx_auto.hpp" -#include "cocos2d_specifics.hpp" - -#if (CC_TARGET_PLATFORM != CC_PLATFORM_WIN32) -#include -#include -#endif - -USING_NS_CC; -USING_NS_CC_EXT; -using namespace std; -using namespace CocosDenshion; - -AppDelegate::AppDelegate() -{ - -} - -AppDelegate::~AppDelegate() -{ -} - -bool AppDelegate::applicationDidFinishLaunching() -{ - // initialize director - auto director = Director::getInstance(); - director->setOpenGLView(EGLView::getInstance()); - - // turn on display FPS - //director->setDisplayStats(true); - - // set FPS. the default value is 1.0/60 if you don't call this - director->setAnimationInterval(1.0 / 60); - - ScriptingCore* sc = ScriptingCore::getInstance(); - sc->addRegisterCallback(register_all_cocos2dx); - sc->addRegisterCallback(register_cocos2dx_js_extensions); - - - sc->start(); - - auto scene = Scene::create(); - auto updateLayer = new UpdateLayer(); - scene->addChild(updateLayer); - updateLayer->release(); - - director->runWithScene(scene); - - return true; -} - -// This function will be called when the app is inactive. When comes a phone call,it's be invoked too -void AppDelegate::applicationDidEnterBackground() -{ - Director::getInstance()->stopAnimation(); - SimpleAudioEngine::getInstance()->pauseBackgroundMusic(); - SimpleAudioEngine::getInstance()->pauseAllEffects(); -} - -// this function will be called when the app is active again -void AppDelegate::applicationWillEnterForeground() -{ - Director::getInstance()->startAnimation(); - SimpleAudioEngine::getInstance()->resumeBackgroundMusic(); - SimpleAudioEngine::getInstance()->resumeAllEffects(); -} - -UpdateLayer::UpdateLayer() -: pItemEnter(NULL) -, pItemReset(NULL) -, pItemUpdate(NULL) -, pProgressLabel(NULL) -, isUpdateItemClicked(false) -{ - init(); -} - -UpdateLayer::~UpdateLayer() -{ -} - -void UpdateLayer::update(cocos2d::Object *pSender) -{ - pProgressLabel->setString(""); - - // update resources - pAssetsManager->update(); - - isUpdateItemClicked = true; -} - -void UpdateLayer::reset(cocos2d::Object *pSender) -{ - pProgressLabel->setString(" "); - - // Remove downloaded files -#if (CC_TARGET_PLATFORM != CC_PLATFORM_WIN32) - string command = "rm -r "; - // Path may include space. - command += "\"" + pathToSave + "\""; - system(command.c_str()); -#else - string command = "rd /s /q "; - // Path may include space. - command += "\"" + pathToSave + "\""; - system(command.c_str()); -#endif - // Delete recorded version codes. - pAssetsManager->deleteVersion(); - - createDownloadedDir(); -} - -void UpdateLayer::enter(cocos2d::Object *pSender) -{ - // Should set search resource path before running script if "update" is not clicked. - // Because AssetsManager will set - if (! isUpdateItemClicked) - { - vector searchPaths = FileUtils::getInstance()->getSearchPaths(); - searchPaths.insert(searchPaths.begin(), pathToSave); - FileUtils::getInstance()->setSearchPaths(searchPaths); - } - - auto pEngine = ScriptingCore::getInstance(); - ScriptEngineManager::getInstance()->setScriptEngine(pEngine); - ScriptingCore::getInstance()->runScript("main.js"); -} - -bool UpdateLayer::init() -{ - Layer::init(); - - createDownloadedDir(); - - /** Creates assets manager */ - pAssetsManager = new AssetsManager("https://raw.github.com/minggo/AssetsManagerTest/master/package.zip", - "https://raw.github.com/minggo/AssetsManagerTest/master/version", - pathToSave.c_str()); - pAssetsManager->setDelegate(this); - pAssetsManager->setConnectionTimeout(3); - addChild(pAssetsManager); - pAssetsManager->release(); - - auto size = Director::getInstance()->getWinSize(); - - pItemReset = MenuItemFont::create("reset", CC_CALLBACK_1(UpdateLayer::reset,this)); - pItemEnter = MenuItemFont::create("enter", CC_CALLBACK_1(UpdateLayer::enter, this)); - pItemUpdate = MenuItemFont::create("update", CC_CALLBACK_1(UpdateLayer::update, this)); - - pItemEnter->setPosition(Point(size.width/2, size.height/2 + 50)); - pItemReset->setPosition(Point(size.width/2, size.height/2)); - pItemUpdate->setPosition(Point(size.width/2, size.height/2 - 50)); - - auto menu = Menu::create(pItemUpdate, pItemEnter, pItemReset, NULL); - menu->setPosition(Point(0,0)); - addChild(menu); - - pProgressLabel = LabelTTF::create("", "Arial", 20); - pProgressLabel->setPosition(Point(100, 50)); - addChild(pProgressLabel); - - return true; -} - -void UpdateLayer::createDownloadedDir() -{ - pathToSave = FileUtils::getInstance()->getWritablePath(); - pathToSave += "tmpdir"; - - // Create the folder if it doesn't exist -#if (CC_TARGET_PLATFORM != CC_PLATFORM_WIN32) - DIR *pDir = NULL; - - pDir = opendir (pathToSave.c_str()); - if (! pDir) - { - mkdir(pathToSave.c_str(), S_IRWXU | S_IRWXG | S_IRWXO); - } -#else - if ((GetFileAttributesA(pathToSave.c_str())) == INVALID_FILE_ATTRIBUTES) - { - CreateDirectoryA(pathToSave.c_str(), 0); - } -#endif -} - -void UpdateLayer::onError(AssetsManager::ErrorCode errorCode) -{ - if (errorCode == AssetsManager::ErrorCode::NO_NEW_VERSION) - { - pProgressLabel->setString("no new version"); - } - - if (errorCode == AssetsManager::ErrorCode::NETWORK) - { - pProgressLabel->setString("network error"); - } -} - -void UpdateLayer::onProgress(int percent) -{ - char progress[20]; - snprintf(progress, 20, "downloading %d%%", percent); - pProgressLabel->setString(progress); -} - -void UpdateLayer::onSuccess() -{ - pProgressLabel->setString("download ok"); -} diff --git a/samples/Cpp/AssetsManagerTest/Classes/AppDelegate.h b/samples/Cpp/AssetsManagerTest/Classes/AppDelegate.h deleted file mode 100644 index 2a0dae6d7b..0000000000 --- a/samples/Cpp/AssetsManagerTest/Classes/AppDelegate.h +++ /dev/null @@ -1,75 +0,0 @@ -// -// AssetsManagerTestAppDelegate.h -// AssetsManagerTest -// -// Created by minggo on 2/5/13. -// Copyright __MyCompanyName__ 2013. All rights reserved. -// - -#ifndef _APP_DELEGATE_H_ -#define _APP_DELEGATE_H_ - -#include "CCApplication.h" -#include "cocos2d.h" -#include "extensions/assets-manager/AssetsManager.h" - -/** -@brief The cocos2d Application. - -The reason to implement with private inheritance is to hide some interface details of Director. -*/ -class AppDelegate : private cocos2d::Application -{ -public: - AppDelegate(); - virtual ~AppDelegate(); - - /** - @brief Implement Director and Scene init code here. - @return true Initialize success, app continue. - @return false Initialize failed, app terminate. - */ - virtual bool applicationDidFinishLaunching(); - - /** - @brief The function is called when the application enters the background - @param the pointer of the application instance - */ - virtual void applicationDidEnterBackground(); - - /** - @brief The function is called when the application enters the foreground - @param the pointer of the application instance - */ - virtual void applicationWillEnterForeground(); -}; - -class UpdateLayer : public cocos2d::Layer, public cocos2d::extension::AssetsManagerDelegateProtocol -{ -public: - UpdateLayer(); - ~UpdateLayer(); - virtual bool init(); - - void enter(cocos2d::Object *pSender); - void reset(cocos2d::Object *pSender); - void update(cocos2d::Object *pSender); - - virtual void onError(cocos2d::extension::AssetsManager::ErrorCode errorCode); - virtual void onProgress(int percent); - virtual void onSuccess(); - -private: - cocos2d::extension::AssetsManager* pAssetsManager; - void createDownloadedDir(); - - cocos2d::MenuItemFont *pItemEnter; - cocos2d::MenuItemFont *pItemReset; - cocos2d::MenuItemFont *pItemUpdate; - cocos2d::LabelTTF *pProgressLabel; - std::string pathToSave; - bool isUpdateItemClicked; -}; - -#endif // _APP_DELEGATE_H_ - diff --git a/samples/Cpp/AssetsManagerTest/README.md b/samples/Cpp/AssetsManagerTest/README.md deleted file mode 100644 index 9d39a99748..0000000000 --- a/samples/Cpp/AssetsManagerTest/README.md +++ /dev/null @@ -1,37 +0,0 @@ -This sample shows how to use AssetsManager to auto-update application resources(pictures or scripts). - -In this sample, there is a scene which contains three items: -* enter - - Start to run script. -* reset - - Delete downloaded resources and delete recorded version code. -* update - - Download new version of package if it exits. - -You can use this sample like this: -* Run original version application(refered as v1) - -``` -start application -click "enter" -``` -* Run new version application(v2) - -``` -start application -click "update" -click "enter" -``` -You will find the changes. -* Run v1 again after running v2 - -``` -start application -click "reset" -click "enter" -``` -The application turns back to v1. Ofcourse you can run v2 again as mentioned abave. - diff --git a/samples/Cpp/AssetsManagerTest/Resources/Background.png.REMOVED.git-id b/samples/Cpp/AssetsManagerTest/Resources/Background.png.REMOVED.git-id deleted file mode 100644 index f02d84fd8f..0000000000 --- a/samples/Cpp/AssetsManagerTest/Resources/Background.png.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -5fe89fb5bd58cedf13b0363f97b20e3ea7ff255d \ No newline at end of file diff --git a/samples/Cpp/AssetsManagerTest/Resources/main.js b/samples/Cpp/AssetsManagerTest/Resources/main.js deleted file mode 100644 index a796a32e50..0000000000 --- a/samples/Cpp/AssetsManagerTest/Resources/main.js +++ /dev/null @@ -1,52 +0,0 @@ -/**************************************************************************** - Copyright (c) 2010-2012 cocos2d-x.org - - http://www.cocos2d-x.org - - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - THE SOFTWARE. - ****************************************************************************/ - -// boot code needed for cocos2d + JS bindings. -// Not needed by cocos2d-html5 - -require('jsb_cocos2d.js'); - -var appFiles = [ - 'myApp.js' -]; - -cc.dumpConfig(); - -for( var i=0; i < appFiles.length; i++) { - require( appFiles[i] ); -} - -var director = cc.Director.getInstance(); -director.setDisplayStats(true); - -// set FPS. the default value is 1.0/60 if you don't call this -director.setAnimationInterval(1.0 / 60); - -// create a scene. it's an autorelease object -var myScene = new MyScene(); - -// run -director.replaceScene(myScene); - diff --git a/samples/Cpp/AssetsManagerTest/Resources/myApp.js b/samples/Cpp/AssetsManagerTest/Resources/myApp.js deleted file mode 100644 index e2e6342648..0000000000 --- a/samples/Cpp/AssetsManagerTest/Resources/myApp.js +++ /dev/null @@ -1,99 +0,0 @@ -/**************************************************************************** - Copyright (c) 2010-2012 cocos2d-x.org - Copyright (c) 2008-2010 Ricardo Quesada - Copyright (c) 2011 Zynga Inc. - - http://www.cocos2d-x.org - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - THE SOFTWARE. - ****************************************************************************/ - -var MyLayer = cc.Layer.extend({ - isMouseDown:false, - helloImg:null, - helloLabel:null, - circle:null, - sprite:null, - - ctor:function() { - this._super(); - cc.associateWithNative( this, cc.Layer ); - }, - - init:function () { - - ////////////////////////////// - // 1. super init first - this._super(); - - ///////////////////////////// - // 2. add a menu item with "X" image, which is clicked to quit the program - // you may modify it. - // ask director the window size - var size = cc.Director.getInstance().getWinSize(); - - // add a "close" icon to exit the progress. it's an autorelease object - var closeItem = cc.MenuItemImage.create( - "CloseNormal.png", - "CloseSelected.png", - function () { - cc.log("close button was clicked."); - },this); - closeItem.setAnchorPoint(cc.p(0.5, 0.5)); - - var menu = cc.Menu.create(closeItem); - menu.setPosition(cc.p(0, 0)); - this.addChild(menu, 1); - closeItem.setPosition(cc.p(size.width - 20, 20)); - - ///////////////////////////// - // 3. add your codes below... - // add a label shows "Hello World" - // create and initialize a label - this.helloLabel = cc.LabelTTF.create("Hello World", "Arial", 38); - // position the label on the center of the screen - this.helloLabel.setPosition(cc.p(size.width / 2, size.height - 40)); - // add the label as a child to this layer - this.addChild(this.helloLabel, 5); - - // add "Helloworld" splash screen" - this.sprite = cc.Sprite.create("Background.png"); - this.sprite.setAnchorPoint(cc.p(0.5, 0.5)); - this.sprite.setPosition(cc.p(size.width / 2, size.height / 2)); - - this.addChild(this.sprite, 0); - - return true; - } - -}); - -var MyScene = cc.Scene.extend({ - ctor:function() { - this._super(); - cc.associateWithNative( this, cc.Scene ); - }, - - onEnter:function () { - this._super(); - var layer = new MyLayer(); - this.addChild(layer); - layer.init(); - } -}); diff --git a/samples/Cpp/AssetsManagerTest/proj.android/.project b/samples/Cpp/AssetsManagerTest/proj.android/.project deleted file mode 100644 index 515077d245..0000000000 --- a/samples/Cpp/AssetsManagerTest/proj.android/.project +++ /dev/null @@ -1,70 +0,0 @@ - - - AssetsManagerTest - - - - - - com.android.ide.eclipse.adt.ResourceManagerBuilder - - - - - com.android.ide.eclipse.adt.PreCompilerBuilder - - - - - org.eclipse.jdt.core.javabuilder - - - - - com.android.ide.eclipse.adt.ApkBuilder - - - - - org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder - full,incremental, - - - - - - com.android.ide.eclipse.adt.AndroidNature - org.eclipse.jdt.core.javanature - org.eclipse.cdt.core.cnature - org.eclipse.cdt.core.ccnature - org.eclipse.cdt.managedbuilder.core.managedBuildNature - org.eclipse.cdt.managedbuilder.core.ScannerConfigNature - - - - Classes - 2 - COCOS2DX/samples/Cpp/AssetsManagerTest/Classes - - - cocos2dx - 2 - COCOS2DX/cocos2dx - - - cocosdenshion - 2 - COCOS2DX/CocosDenshion - - - extensions - 2 - COCOS2DX/extensions - - - scripting - 2 - COCOS2DX/scripting - - - diff --git a/samples/Cpp/AssetsManagerTest/proj.android/AndroidManifest.xml b/samples/Cpp/AssetsManagerTest/proj.android/AndroidManifest.xml deleted file mode 100644 index b236420d07..0000000000 --- a/samples/Cpp/AssetsManagerTest/proj.android/AndroidManifest.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/samples/Cpp/AssetsManagerTest/proj.android/build.xml b/samples/Cpp/AssetsManagerTest/proj.android/build.xml deleted file mode 100644 index 94460967a5..0000000000 --- a/samples/Cpp/AssetsManagerTest/proj.android/build.xml +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/samples/Cpp/AssetsManagerTest/proj.android/jni/Android.mk b/samples/Cpp/AssetsManagerTest/proj.android/jni/Android.mk deleted file mode 100644 index 28588e400a..0000000000 --- a/samples/Cpp/AssetsManagerTest/proj.android/jni/Android.mk +++ /dev/null @@ -1,30 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE := game_shared - -LOCAL_MODULE_FILENAME := libgame - -LOCAL_SRC_FILES := hellocpp/main.cpp \ - ../../Classes/AppDelegate.cpp - -LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../Classes - -LOCAL_WHOLE_STATIC_LIBRARIES := cocos_jsb_static -LOCAL_WHOLE_STATIC_LIBRARIES += jsb_chipmunk_static -LOCAL_WHOLE_STATIC_LIBRARIES += jsb_extension_static -LOCAL_WHOLE_STATIC_LIBRARIES += jsb_localstorage_static -LOCAL_WHOLE_STATIC_LIBRARIES += jsb_network_static -LOCAL_WHOLE_STATIC_LIBRARIES += jsb_builder_static - -LOCAL_EXPORT_CFLAGS := -DCOCOS2D_DEBUG=2 -DCOCOS2D_JAVASCRIPT - -include $(BUILD_SHARED_LIBRARY) - -$(call import-module,scripting/javascript/bindings) -$(call import-module,scripting/javascript/bindings/chipmunk) -$(call import-module,scripting/javascript/bindings/extension) -$(call import-module,scripting/javascript/bindings/localstorage) -$(call import-module,scripting/javascript/bindings/network) -$(call import-module,scripting/javascript/bindings/cocosbuilder) diff --git a/samples/Cpp/AssetsManagerTest/proj.android/jni/Application.mk b/samples/Cpp/AssetsManagerTest/proj.android/jni/Application.mk deleted file mode 100644 index 74af9626ab..0000000000 --- a/samples/Cpp/AssetsManagerTest/proj.android/jni/Application.mk +++ /dev/null @@ -1,5 +0,0 @@ -APP_STL := gnustl_static - -# add -Wno-literal-suffix to avoid warning: warning: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wliteral-suffix] -# in NDK_ROOT/arch-arm/usr/include/sys/cdefs_elf.h:35:28: when using ndk-r9 -APP_CPPFLAGS := -frtti -DCOCOS2D_DEBUG=1 -std=c++11 -Wno-literal-suffix -fsigned-char diff --git a/samples/Cpp/AssetsManagerTest/proj.android/jni/hellocpp/main.cpp b/samples/Cpp/AssetsManagerTest/proj.android/jni/hellocpp/main.cpp deleted file mode 100644 index 0d0564246f..0000000000 --- a/samples/Cpp/AssetsManagerTest/proj.android/jni/hellocpp/main.cpp +++ /dev/null @@ -1,14 +0,0 @@ -#include "AppDelegate.h" -#include "platform/android/jni/JniHelper.h" -#include -#include - -#define LOG_TAG "main" -#define LOGD(...) __android_log_print(ANDROID_LOG_DEBUG,LOG_TAG,__VA_ARGS__) - -using namespace cocos2d; - -void cocos_android_app_init (struct android_app* app) { - LOGD("cocos_android_app_init"); - AppDelegate *pAppDelegate = new AppDelegate(); -} diff --git a/samples/Cpp/AssetsManagerTest/proj.android/project.properties b/samples/Cpp/AssetsManagerTest/proj.android/project.properties deleted file mode 100644 index f7e62936d0..0000000000 --- a/samples/Cpp/AssetsManagerTest/proj.android/project.properties +++ /dev/null @@ -1,15 +0,0 @@ -# This file is automatically generated by Android Tools. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file must be checked in Version Control Systems. -# -# To customize properties used by the Ant build system edit -# "ant.properties", and override values to adapt the script to your -# project structure. -# -# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home): -#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt - -# Project target. -target=android-10 -android.library.reference.1=../../../../cocos/2d/platform/android/java diff --git a/samples/Cpp/AssetsManagerTest/proj.android/res/values/strings.xml b/samples/Cpp/AssetsManagerTest/proj.android/res/values/strings.xml deleted file mode 100644 index 99a292d37c..0000000000 --- a/samples/Cpp/AssetsManagerTest/proj.android/res/values/strings.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - AssetsManager - diff --git a/samples/Cpp/AssetsManagerTest/proj.android/src/org/cocos2dx/AssetsManagerTest/Cocos2dxActivity.java b/samples/Cpp/AssetsManagerTest/proj.android/src/org/cocos2dx/AssetsManagerTest/Cocos2dxActivity.java deleted file mode 100644 index c30457e9fb..0000000000 --- a/samples/Cpp/AssetsManagerTest/proj.android/src/org/cocos2dx/AssetsManagerTest/Cocos2dxActivity.java +++ /dev/null @@ -1,33 +0,0 @@ -package org.cocos2dx.AssetsManagerTest; - -import android.app.NativeActivity; -import android.graphics.PixelFormat; -import android.os.Bundle; - -public class Cocos2dxActivity extends NativeActivity { - - @Override - protected void onCreate(Bundle savedInstanceState) { - // TODO Auto-generated method stub - super.onCreate(savedInstanceState); - - //For supports translucency - - //1.change "attribs" in cocos\2d\platform\android\nativeactivity.cpp - /*const EGLint attribs[] = { - EGL_SURFACE_TYPE, EGL_WINDOW_BIT, - EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT, - //EGL_BLUE_SIZE, 5, -->delete - //EGL_GREEN_SIZE, 6, -->delete - //EGL_RED_SIZE, 5, -->delete - EGL_BUFFER_SIZE, 32, //-->new field - EGL_DEPTH_SIZE, 16, - EGL_STENCIL_SIZE, 8, - EGL_NONE - };*/ - - //2.Set the format of window - // getWindow().setFormat(PixelFormat.TRANSLUCENT); - - } -} diff --git a/samples/Cpp/AssetsManagerTest/proj.ios/AppController.h b/samples/Cpp/AssetsManagerTest/proj.ios/AppController.h deleted file mode 100644 index 0979818386..0000000000 --- a/samples/Cpp/AssetsManagerTest/proj.ios/AppController.h +++ /dev/null @@ -1,20 +0,0 @@ -// -// AssetsManagerTestAppController.h -// AssetsManagerTest -// -// Created by minggo on 2/5/13. -// Copyright __MyCompanyName__ 2013. All rights reserved. -// - -@class RootViewController; - -@interface AppController : NSObject { - UIWindow *window; - RootViewController *viewController; -} - -@property (nonatomic, retain) UIWindow *window; -@property (nonatomic, retain) RootViewController *viewController; - -@end - diff --git a/samples/Cpp/AssetsManagerTest/proj.ios/AppController.mm b/samples/Cpp/AssetsManagerTest/proj.ios/AppController.mm deleted file mode 100644 index e009328669..0000000000 --- a/samples/Cpp/AssetsManagerTest/proj.ios/AppController.mm +++ /dev/null @@ -1,122 +0,0 @@ -// -// AssetsManagerTestAppController.mm -// AssetsManagerTest -// -// Created by minggo on 2/5/13. -// Copyright __MyCompanyName__ 2013. All rights reserved. -// -#import -#import "AppController.h" -#import "cocos2d.h" -#import "EAGLView.h" -#import "AppDelegate.h" - -#import "RootViewController.h" - -@implementation AppController - -@synthesize window; -@synthesize viewController; - -#pragma mark - -#pragma mark Application lifecycle - -// cocos2d application instance -static AppDelegate s_sharedApplication; - -- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { - - // Override point for customization after application launch. - - // Add the view controller's view to the window and display. - window = [[UIWindow alloc] initWithFrame: [[UIScreen mainScreen] bounds]]; - CCEAGLView *__glView = [CCEAGLView viewWithFrame: [window bounds] - pixelFormat: kEAGLColorFormatRGBA8 - depthFormat: GL_DEPTH_COMPONENT16 - preserveBackbuffer: NO - sharegroup: nil - multiSampling: NO - numberOfSamples:0 ]; - - // Use RootViewController manage CCEAGLView - viewController = [[RootViewController alloc] initWithNibName:nil bundle:nil]; - viewController.wantsFullScreenLayout = YES; - viewController.view = __glView; - - // Set RootViewController to window - if ( [[UIDevice currentDevice].systemVersion floatValue] < 6.0) - { - // warning: addSubView doesn't work on iOS6 - [window addSubview: viewController.view]; - } - else - { - // use this method on ios6 - [window setRootViewController:viewController]; - } - - [window makeKeyAndVisible]; - - [[UIApplication sharedApplication] setStatusBarHidden: YES]; - - cocos2d::Application::getInstance()->run(); - return YES; -} - - -- (void)applicationWillResignActive:(UIApplication *)application { - /* - Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state. - Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game. - */ - cocos2d::Director::getInstance()->pause(); -} - -- (void)applicationDidBecomeActive:(UIApplication *)application { - /* - Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface. - */ - cocos2d::Director::getInstance()->resume(); -} - -- (void)applicationDidEnterBackground:(UIApplication *)application { - /* - Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later. - If your application supports background execution, called instead of applicationWillTerminate: when the user quits. - */ - cocos2d::Application::getInstance()->applicationDidEnterBackground(); -} - -- (void)applicationWillEnterForeground:(UIApplication *)application { - /* - Called as part of transition from the background to the inactive state: here you can undo many of the changes made on entering the background. - */ - cocos2d::Application::getInstance()->applicationWillEnterForeground(); -} - -- (void)applicationWillTerminate:(UIApplication *)application { - /* - Called when the application is about to terminate. - See also applicationDidEnterBackground:. - */ -} - - -#pragma mark - -#pragma mark Memory management - -- (void)applicationDidReceiveMemoryWarning:(UIApplication *)application { - /* - Free up as much memory as possible by purging cached data objects that can be recreated (or reloaded from disk) later. - */ - cocos2d::Director::getInstance()->purgeCachedData(); -} - - -- (void)dealloc { - [super dealloc]; -} - - -@end - diff --git a/samples/Cpp/AssetsManagerTest/proj.ios/Prefix.pch b/samples/Cpp/AssetsManagerTest/proj.ios/Prefix.pch deleted file mode 100644 index 5d8be4921e..0000000000 --- a/samples/Cpp/AssetsManagerTest/proj.ios/Prefix.pch +++ /dev/null @@ -1,8 +0,0 @@ -// -// Prefix header for all source files of the 'AssetsManagerTest' target in the 'AssetsManagerTest' project -// - -#ifdef __OBJC__ - #import - #import -#endif diff --git a/samples/Cpp/AssetsManagerTest/proj.ios/RootViewController.h b/samples/Cpp/AssetsManagerTest/proj.ios/RootViewController.h deleted file mode 100644 index 17d8b1ca23..0000000000 --- a/samples/Cpp/AssetsManagerTest/proj.ios/RootViewController.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// AssetsManagerTestAppController.h -// AssetsManagerTest -// -// Created by minggo on 2/5/13. -// Copyright __MyCompanyName__ 2013. All rights reserved. -// - -#import - - -@interface RootViewController : UIViewController { - -} -- (BOOL)prefersStatusBarHidden; -@end diff --git a/samples/Cpp/AssetsManagerTest/proj.ios/RootViewController.mm b/samples/Cpp/AssetsManagerTest/proj.ios/RootViewController.mm deleted file mode 100644 index 779facc5b7..0000000000 --- a/samples/Cpp/AssetsManagerTest/proj.ios/RootViewController.mm +++ /dev/null @@ -1,79 +0,0 @@ -// -// AssetsManagerTestAppController.h -// AssetsManagerTest -// -// Created by minggo on 2/5/13. -// Copyright __MyCompanyName__ 2013. All rights reserved. -// - -#import "RootViewController.h" - - -@implementation RootViewController - -/* - // The designated initializer. Override if you create the controller programmatically and want to perform customization that is not appropriate for viewDidLoad. -- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil { - if ((self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil])) { - // Custom initialization - } - return self; -} -*/ - -/* -// Implement loadView to create a view hierarchy programmatically, without using a nib. -- (void)loadView { -} -*/ - -/* -// Implement viewDidLoad to do additional setup after loading the view, typically from a nib. -- (void)viewDidLoad { - [super viewDidLoad]; -} - -*/ -// Override to allow orientations other than the default portrait orientation. -// This method is deprecated on ios6 -- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { - return UIInterfaceOrientationIsLandscape( interfaceOrientation ); -} - -// For ios6, use supportedInterfaceOrientations & shouldAutorotate instead -- (NSUInteger) supportedInterfaceOrientations{ -#ifdef __IPHONE_6_0 - return UIInterfaceOrientationMaskLandscape; -#endif -} - -- (BOOL) shouldAutorotate { - return YES; -} - -//fix not hide status on ios7 -- (BOOL)prefersStatusBarHidden -{ - return YES; -} - -- (void)didReceiveMemoryWarning { - // Releases the view if it doesn't have a superview. - [super didReceiveMemoryWarning]; - - // Release any cached data, images, etc that aren't in use. -} - -- (void)viewDidUnload { - [super viewDidUnload]; - // Release any retained subviews of the main view. - // e.g. self.myOutlet = nil; -} - - -- (void)dealloc { - [super dealloc]; -} - - -@end diff --git a/samples/Cpp/AssetsManagerTest/proj.ios/iTunesArtwork b/samples/Cpp/AssetsManagerTest/proj.ios/iTunesArtwork deleted file mode 100644 index b1cc056ba575a346e1bfa3baa189c20efbfe496b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 61982 zcmW(+Wn5HW6TTb7l1qog(j^TdQcFp9hk!vSBB9c-OG&772@)bDjg&|&3P`AwgtUZ6 zcW=D=e?Q#cy&vv9XJ*bkGtbO9H{R4(hnj+&0ssJNJzXtx000vo!2mfa@pc^e>ymhb z`RLj`1prEh|1J=a^Oh9=C`=w|YMPpQct7)g>f!B!(9_gJ`1pCdJ$&p60D&`k7Vef7 z8_X(a3&$D;ap-gdZ*wMcgt^8`G-HaOC=U#-AIJ0VH~z&A~)u2&u9H4Kws$f+`QWzFQ#R39|B=$4|s z_4NH&l|V*N@cRI8@`eXIPjP%8;5=MeS&SD$)(LjBF1>*F8FQ^ zQsPU{8#b8;IohS8?*LGk!bH^e2p9O1rsn6*8;Q*{&f=S0qy*l3_g3(0!<9Zr0QmDP zd=!6OvVk3~M2hyp7YXb_J)9^DpP#*S`$&sy0tz=~Y>s^XvyJw<r6SZ<)9m$mN#%rXC^a_j-9xN|jzk;YP$^&(eR6!vr;^lYlLrx8Z z;I_{&%Vz*^*yi2+OPCyj_K5m396;Dp!|4er6DS+8SAIl4*ax+$?PH=;H8d%kGEH7FjSIs9Bisv#F{3eC@$4VyK^H@rv@2f`r&FiqV`$P4-RaBLI z>~+>vkhb`f`@{7CQ2GdM4D1FpKm&1?OI_F2(AIcbw;aL2FGn{6Q-DFD&Atfnrj;8s z3Vx=$=wZDlBOPn2d!28RK8ZmR9ulY7qrgueuPGzcnhe&fFSZ<`AG{?3w4KFMCA`dzbmtyye2gWU5R#UD}3dIlxcMH%Dl9xNVb4{QHD`%E{V z!DXB^Vly_hq4O{6ALKZIiuwgp)VDZyVYXaWGFErC0M^=U!&0{Kmu%lGr4*#Mve)0x zzVWuQ6>Sy`Wl9;O$k5La%(x~hY5Ad|v|^!x((1@+$TI1JlSNp~Z7W%el@G9AnUz)* zd8S(y*DTyWD3!-nxR-ldsuhRZ;o?c{z8Zct(JVGAtan~%??X`DXKM(&&f`g4`Qmwm ze2-xLkKdvGqHWnY&bF5-6(8OyYRc-%+BBFSrMsz-tz`S2zkOy5TNf_NItou%VB8Z~ z7P(d`XV@z3>gZXKnU!fsk6XQ_U&D)-9!dMk5Eew#fo)4cN)sabM2<8IcU=#C{WThr{-9Cp|J9*cWRZ_U@;w2ri}&tb1|DrD5LziBEt?K#7rHu^E%vc9#D z^YiVlT3GLK=7yxZ?J#_JT6U$GVMwIsVV*_qxQ;uEd+XDvqqvvx29ZM&S*jAb*ZSuB zJ683do%r7Q6Fhd3m)ns0Wv6_$cK62a!`;}qg70z#BKdZ*Pe;D?Yc83sjjB-=WJq}~ zR)w2rnnbuat@BCVmrSv#o~mmp38*-`yT_t>s_Iv;qPn82upqNw=lop()6(BEWb)NJ z-#KPc6U9e(KnNy`0%d3ckUJzkLOsF(e03fi%F~soc5Bx4^yBXx^;dP+fMk=2oF z-PJrE{oBdaJZJ0KKU01_q=_*N|2H{8cK7eymtVuFgkoZ2Y+k4(`o!6?k4k6B2aL{X zK3&wh)XLOa$aR-CQLGi$mlsv7ka(m#qwrbovs#~oo89*b+dNyn#|9jV5~4LXo;>bc z#O@r$F6S*%u7t2;OZMOK33~VQ%W+H@^9Kp~>$ftIhH=I>)A!ZkqUFr51P&Pj1QIEN zzHokV=an42F&a0m=_tx&e5fmG6r8%9(k>sw-z!^keXTWG=tFY5A+_Or?yY?09DjtD zjLNMJ>8R9{WM7R69;38o_f7Y|ZvI16t}!3+y-!}YNOEP64R|&rSCQC>Q#5Oo{n@e68*obr5{_UuGr1(+U zH)xh(g^5J$g*9oF@~4DmQLhP;${m}mn(z+6U?a~6r|!YX?k14u7Nr%%T1?p1+|ObGQ}s+Mt84;w4cgtPs}>BpW##oI%lmwRz?$U6RuZ!R}E)sHSrZ2=b2YtcdCuO ze0RP<#vnK{KAPsK)?X8xV=9*BNt0q*IyB$7JMnpY0pip*sI6YV?OW#a(F$7KID;*o zaZ%rz@qZOk^@nVn+n>{&Q}U5U&SB2&T#KA5hkFj6O}?v+PHrv)V|8Y^Y2V5z+Xd+# zSq?m$*@zrZb3Yt@m6wqh7A|oy=Q3N=9I}4@=i(z;@4e6PXMe`D2`|@`+LeAf9)5au z_;GfP!RC`qPVFscugzzh%J{T#lW%Qr+j44J9X(rjgFBi++|D+xLb5ZbM7H)(f1M((Kp)|`)>P;M<^UsimU$Tt!9bw0=x>Xv~s+qjTyjMW%WsYjT7kW?~X_PZi;xIu<+cF-&^(SBZCn0#jD@1rO96% z(0NMP*3-qMMDxqhKjr%I%B^%^k$c|igsXCE-#Xyr_{v84fjCSWQ|?d&P9Bw^|$ z2oCh3;s^m7&VeTJZYokkxRR0`*iqRTg$QoI+hlqr125PMfz1X9AsL5aR-|I@w(xZ4 zx+pL%G!yb~fgXeF=#bnz(~iM^Gyt!X3o3I%R zCAi$?PE@)OOL_;&9Jeb>LJlIiWsqp&L!}=xD@j74NWDaYR;FDd0bg zV>S9$Vj8!7c}l)JyaRZa{q{Jf*BU>$>#M^K21rG4MjcV+UmoiiWUtXB04;H6_>QR5 zOf;*2t`fNEP4BSm+ROd{{LaU-*deH`!XGL^%3Fx_c_k@)jzMvD!T^jyE>7ZEE&78uJPJ>o0EA= z;=TWVL*Tca&YX(zV8LgIXex3Yo_-~u9fBB#9#?A1puNrS-ceHq>|ae;6wy#4>tDer zP1PDPe@O!Y<6|C>pd|XESc>^gpkzx^^9v|e?dXN=QmxVHcqEFdR_%I3vI=cj1||l$ zFao+j8k72k!#k4Te`%~PwRXnQ?dWM2*8k5o2R7QhGrf*9wGdV?j&VB8-+l-9`~ zBj7?4*rWKVeR`UP?xf$(umXx7-$aIrNTX-7JLEkl{k}m{V<rFKB8gH_?8rM=5$(67b5RZIY9Q-?nI1kk)tn2Q>gE+K}U|Cx%2~aAm?XCw( zfr02aR5NeF1ud5#wE>>)nozkw&ywmzl7s-d$TCo9qahSLFKa|2p^(zPzIY#Yth3Xil|GOfI-z8Uc;O z_-X_{_9J_LIAhs@E^jHm)THb6{H2Nai$?Q7s$`Z@B9Khv(XWwA@Hosw;rR`oV_!6u zi$sMyxv;)2$aq&WbY!V1+w*X4Je&4sLJ__@&2BgwOk(SjH?{dVUx$-?8ysOQ13 z?l2%ojr^f$1-Tx&i{qb|7)aN!&?F10tNSE;=Ra65Yx*PnY*iaC*sRb>NrxQL2rWUj zMh+fwAqWUTR)Iup4E>2H{D}q-3Xx+4@W^4a1U1mR_t7fewGIp0{2bUTj?!a<{#qJWF1@UdQy+SbX_1dZtF&eDry`eQ3} zE%eGm56%Bj9vSNI@`LC)Oc+9=FB!Y9%_cj_NxX38>3a?O!e$ZLU-C!Yeu`|vY8uJc zZ-PdW%oBzWVc`|4YF3em0uJF*?h$M9f9#|WQyC~f8(vv1)xJJEn$0}8l;nXHko7;e zZ*|@}$T~Rv9o_q}&}5Yk?25_P`amiLEH%&95*_w%lOXgv;xe=ExaZ8fGJ>4@c)zUO z98nIcx>aaS>Y;ci(z9DkfK=wADhc@pxYwCMV^LG&LL7eiw1XW`q(#U{Vve@oi-Al} zUe8{JN=#l#LDmKWI90f#Xy z>1jDyFN`dd2@*ox(C2A`K4xOzw_TBrH0v6zj z(Wf07nlr(v(U+ zzeS(gMW6HAObuIc_8(Dz-#E{i z7>-PV!WHXG#tDmp|A<_!+RX}L-=|K&LvdYi#0V!g&o@LDdH4WrMY1XihW+b~{J8W% z>=(d=38TgKnMW?QiTq1@M2}FwNo#|VlQUt)+b-kQSaK!qIe_tzipRJtploP2-4ni@$?8T|p2tO+hTu~$E!jb3`6K4ubhZWZlk zqYf^lB||>ps}iS$w!?vVC>{i_SUyR?5Ne72#CHebAB4~gTT_Wb%$BeBcO#O|xWSh_ z9vvtuxKN)BF|Ow{eY%BgyrOxnDd-WDTKGAZm|aG8lA_ZJnt5!vUaWLTnGja^6kAq%P~3OA*m1Vzhx4so|Me3sT)hJ2CZuJ~MFt|D!k zaX4Y)e4^l`4(?vMV?d{P=TI+9+A^XiO>Ct1! z+`j(6U^*G|DrL=KCsR}yfAVA`ih<_=EpmY`67?$(RX#O5fYXamWBd2Aq4Y!zpvSFi zUgvcny4xg7#fn?CDm^*Q!Aw9A9v@*Xvd;)E;(_o~AX({zD?mjOpYUhMMNvQiu;d^9;pv= z>7I8csFZZ#NxRjm4w2$#Lu(PiOGKWvz7`8om6A)FdYf}I4o7)S zpL}R+mkS$lFn&1ldSuq-0JT?=9v<(Ih00T^@mpMweseNV-xbcs|K`rbcI-{~1UQpb zYKb5QTnNF(lG(AE0t6YoD0_4g7^^k97u!P?0$D@#WD+Jy!TU3E68Mv@^-SDCtTvvr7{D19AtB*0vsU?&Lr zRSP9gTse%!%od=q%btnmmo`E3rVp?~ON3JMkj2#{6S*Z5aBsw{aaIy0U(A4+^$SMi z+CnFWU*&R2Q#C*RhF;vhPqx=ZY@=wK^PhLKvDmsyq1n0$&TG~O2ZXN6Zw1Rngfms; zlR3SRh^mQC+HI0C^Rqoyh5l+i5%*m2*U1Y|q;+ThgvXK3$x-2=p)Nve2|*sq2kmEk zN+X~rf!P`w2LGPZ+LUBOLDjIx+({xZlAe!;B%T6@h{8vyYRz2Yo1+x zJEYhjD7GJ+Ay@kXDAE1ck8??K@JPvorC|{mF~gikci(Lm8CNu&X@2#s z_W0D*#QAie^R-Ux(cITKSu@ol9NAU>!3s-D_2j|~{z6H|XCS02vg=AMcDw0g5<5!k zlLg&8pJD$m5g0`;(h~M19i+}ATt*JB*LYoMSYz*F3{4UH8_2=P`DbY_qXhPudNA`$ zE2B>G#vrA&WV8XHN}*D}{U~c5l6*~jU&wV6JF(>4H*OFBhia<3@!ibt0aI)}0Xnl-*Fi=Ss*W2j2T zp7^0!Q<3zb;}t+vnqsp@CL*VCtEDeJ|TAdy1Rn{CS}yC_FtL^#YhbM9=U7HdT6!^UmQXLCV-;DXz=@lTYDS z>>)hW6Y1Z$&+xYm#4RWlc6|Ss8qX>{niv=4 zv=gojg>3(W|dI9xIvi%F*b4>tMo`%m3tI&szM|I7m>%#ESw2E+dq?)<;r;q8 z620gv=Y$ZkUsn%?nAFJ^|K7QtyE3@?tOPZnGtEGKs>eF`NAM5(%)w0$ju4WzOvyzXM|bV^YyaWgAtv8dn1`t_Ct9HxCK4JmDybP zE2^iVVVIAJ_uLSg6pn^zu}^cUHIhu*AW|`LY{jnG<318>lDuE7MDz5|FsrD zK0pSvCc-b(^$!*!P0y>uVhPTzG_d&iV__5acN&@TQgr~nVKi)^VM~9Gc!l^@Pk?2m zblA&t;L*EjqBlyn%Mtb4Np=NyB>DN_VjPH!tB1iSPX)s6l_S|GSWD8Kpd+IrrofSc zBEGdncnB{iPe4&Ghnh-Uh%ubmxMFjmgb^*ZqSr@hBm}iBRixK3yX=I=}E(vayK~Fs$?)nXVl5(R-)N zmOLp^MymCJV4@FxHW2(SzcbtkS+72lkv{fLSQPy=c#w4+G}IV)Re^aDbjweQf!^u6vb6phX9Wr#9% z$7VaGIrFD<`FV%XGA?Ck&w?MSzXdyc@;6*ufZA^$@?L6T9haPyd%}|zUWpIi=3hSb zUxgyQ^g0?<^(`O=59zulO7Oz3AupsHyJ;ckN}Z#X7c2~f>H2ubIqv0~+Gc)JCorV) zzKyFj#nw=D6d!<69I*k1v!P93KmGsd?x;TLw=Lxk_oC>!Bq%31<4|0^J;&`Ge^1St zbRMOeoz|2ILG5MW8RW<+W(0U?2;jE-z)~}h7siNMvNq* z(^=qLG)uwc!uQX4E&w_WP(t#T0Fja@pIH$<5J$(^o*0C{jG1_QCi(iDnEf>@RZiGW z)#GH`yy>wpwU4$tCt|EcljB*eA6`t{KAx!*?ft!vT>DB4#nt`3eP!zhf4V~174QqH zR0VH8vMkuw?1`uBrOe2Z&e*Y+thk9PfO2 zqBrVtwkLd_uq4r^(*8~IbFJ2sT|QlcsV-q=I*xANMh_o3WpYky48@y{Ooh_%MYNOr z`P{U_a$eUQ>H53-_A&-V!#|iLT{QQ`(39P%2i)?f<>_EV1!xcZ?|tC94!3v{UvoiJn5FVzK|X)<+(r7V z{+YMOVMpMa-SPSJ3r~G|#D{5g4PTAFQ{u0o+i$!1whhwY{pEnoQ+{nz5XGat#jbW# z`5_*bk~Ul1qvoV-s>@DpbjjckzSG>rjJ;4`X5Y$EeHOpp@6OO{EF+b4cCFqz#Q*EH zDeIkSTGW-4MBtP!cDyVcrr=mV8O}Os*medRqrCUH@bgB{{E=nI@no5XlDhfK3;OVT zJOcRW_Iqc_lHq$sQ*>>obWbX{7k7qp+cnS6gr8GV{fydUB!BpbJ0u_a1%rUb9^Qh= zG@$TsjM8r!H1rqBAu&$<)ftKh?Q9lApm#`Feg6B(#(kU8rD~H2A#OsB|NPjr2!whk z`7EgU&3A{hV6#~%++oY^>EDD{ke2*X-y)7(6`Qr#%>AONLKutXE2%KOosse28R#GR zs0~Vw<~`~C^t8t%&zU~4)F>+RB+^e>PwP(JlH%14B5?tq=9pRk&S=w8NE(J};Zrn{r=e;}Y>&tyg&;C(8!Oqv- z-BSp6Q)9V8PTVKZ4X78dFqq@Ros6mD^uRYW9QKcg)*~m?1 z6qc_?s%dOPK3`=1m^*-^dWuR5>U`4@ehnnIvux zDC-F$?egG$tQwQxPfmj5(8SW?J)BHnr7S_cNC2;$g^&5vRVZ3+Yaz3*W4L4!)ybBu zKs7h%=h>@_&Sq1^MWR?nLD{@ySMM=Sr2P8!u;j)37nH9q$m~8`|%f) ziL7?{MoCilQ}h=<*iQmI$AZSbsNf$l>nBtq`(M|$qqL6k?}W5M=eW(U$IuGJA@XUk zP4B1>JpZ!1ogYTDg?nA~hP5h{{Ygs;T-kB%gE+H&B+j=@0R zgP@1VMqmrPgWRIP}|;@&N8RI*MyCN{keDJr$--0-X?|E*=Zyvlk*FJ zwA8_J9S>Gb0eB{y)r16LUZ&Au@p5sARx`mB{oQQpN)yGu*X5{-C_1av$67qVZ55*? zdW0hD_%VS?+%#C8!h+4%6iIkIf;!n~^`5P^4T$omjqt2a20J4=~P}j=z+WWPX%wv)pCfwduYkK7v+rodkx%dDZO8i0BC_%>p}|~jsuxDvm#g8g1is*<_uj1y zpe0C<(%;2tV5R~c3`Mm6Dy3cvzxd0ONKpt~NKQpY(l-+*+8A_vJ};J9EGT+A<>X%P zQ(F!uj5I^7v#<}B@gM)v(_x=4`jYJH5SU+tAIOq|k)uayyysh8xn^i* zyvA*@yr!i)dzrUE0Q&v?hJO#8Bl1s~JjCISP0g^ZQ+YRb`su(~u5H3W<>}XkOzQYJ zBo%KO2#gD5xuZ+$O$ry#B39ntVnjmM6l*AujH*?(^yL%~IC16#edGaCYzm>4bY#ex z%4$lb^>{e@tTux?PR`FPs9rt2N|XxQwD?vR!~Lhy1GJFyh14dXsI5cs;PhLc8wl9C z3?5l9pBsL$OX}EA!^ZjJcR6Tf{Al{308d97x`xI9)mASMT4O*FoY<#EP{5ELYCw=> z*c($MvnX1Ev3u`*OWX;+Fywki_jRzU`<3*-1UZ-NpAFOU|U{;{O~fQ^5e^5uohp^{6LjL1Oo$iUHcu4$Nvy z+jI3J`FRT~Cxqw{%MLG}JNYXzA$iGpj85reL73{V+vi5w--SBCbxcT`^0$R)tZ?ZI z6UFQ50VjOH1Rf#QJD0Q&f(*v{hdsq?_^3W#5RiY;Sc`OaS8Dlg0B^5T$W6waA1l`c zE@ssc9s3m0WPL{lt`99rMSF+>&jyiNOvp!cRld!dX`uJfpkG6u^|NWq_+gJ(uF+`^ z&32~!EGZm{5BBB5eJNwX9Fc{`}1Dz zr>lsvZL&wzpS6%LLpF2)f`VQ(7%o6cR}y9Pto6Cs7vP>enzrcy8IL**#=ld?XK)+E z<$uAT(NAK$hT|)K?K7Qq``h2DDR1!*gETUPD3I@EKe4_JshgbLT)OPuu7Gl#4}#`S zb(~v*K$CtIq*@hew6QSye6?g<5|@^wRH`_}2>|5J!UUY^U1#Gd!b&!j`wgJzRAG0v z)mE43%@b8&3DGB))mE6XL{jS%H0if)7gVhuE)wF{Akiio5oXfyDzED(iB(ncp_-$o zq9sI^Jdw!O_{rmEge6{CrW=q(FHKy7K^`+b1p@z?kxDTP5jF!zI6gmJv7JUql%&1V%O>a6QT_xBKpm>V;i$i(mu5>Q^%qa1bkI+z#iD(eu zQrHH`6SHruJ!?@69G@vQ)Byh5v1Wj#TS;UHw_;o#VZfiJF%u$@d~BsrA?Z+}wZS9}mvnxJnihKU zpF8;Pt#@VVN#&~b_q>*M1;C(GUYnKAV?LqP)YLuDBgCzXN;%4#`5?_j$Pf*XO0?2 zF0}jFB_z&Y-5caU%KmztWSR{;SwVzu^*638-X0i43v=s!5a60c2}QQP3x47I`;w5{ z`Te)1czxiL>P>6C)+^g+Wnh@}v(m@{eHi)ZOd@H!$oo~yowKm~hA=kfbv)y$6yJf8LYK|Sq$FX+%LC!B?SxCisr zxeo_`n`-w|(e9i-_!|_#ZM#>3yEyFGc2=MLTDMBK*k}&8w;y79YmUz3WqAm^k^xk* z=0$_HE;=~ZEAAZFPW;h4Enqf8dmlA+<6_v}-}?3EvvQ)-$TP9m)zk`2N>kA6mo^#M z&OTIC^f}X9Z0P`3SGL&bp=QLo`&L_HZ8k?X39ODf zs>+JC|0^PKbtgJ?#oqVoM%i@>!~yY`PISKIzq`837MFt=HnyTJ;(2SXm-F@6K>)Im zIDo@!iqSf9R;u6L72WI@rl|L+AbBT78GZ96n+jd>yxw`lTiv}ZEmnVyyK(Aryz0wY ze5tJK#KQojF0LONoXvBy@AUM{-P_)=&t<=#LHcoW*8Z*V^o+-;&W&gP8U;X;hhmgk zJ7lJ$ufATR?(MZ?)_k8=!1wXxO(tMX33x#bh_;kydwE_oD-TZSSptQ&?9(&phGTmk zf}h;-E+{|-VB+4g1f2q%RPd5cpY(jKHOOt zMoDJDJoR7zyh|=wzE-2KWkMNNR~=RD8vC<{DpP8hyhvo}K+0Te4t`zWt`-_)#@S&& z@oG&J;N229u>P}9(ff?JQkh<1m3lzJJ9HwE6>}_APz^%8wp=_f{!sYNT$SDtQ5QfO zuFu8?JI$QsZ>5K%W--(^Q#~fK)E3<6)YJJ^iHAhM5CcU0XK2Osmon-^9VVFE_^Y9D z$_#~{ra!Fa%K0;DRQQ;Bp3va`BNg>~AF^KWwY9of-$)vV>$*PF0Oh-y2@+5GG|ff$ z&>IetIHsh6k-D!M^b{b-ppG79jIU(u1h(3W9NPfo*Gz(+v=m3r{i@~P<<&Ci$d}Hh zn@a^&Y%`hioS$$%*59`-@oz4%xbayWWjh<1h~79pE2SX;)N28v4c2nV9(>-DD?$IJ zyC(FOKYJ6DoGLrb225tsojbREU{Ubibyq&MTlseLkxKz}B14Ev^3Pj2@kAfmMBnTY zA(7KGT0RED1J;XGV5!<|J;fX^`McsKtAd(|5PB0q_>pz8l4AraH~ubu@1FnYxvybL z!cQjg+ZrG)*eAEJw9yyp{{gL-*~MQF`T53K53+skZb0!HHjes}LX7Ur{W4rkjnCTGI<>z##p(RP+q`j~xh&Yl1O*H0vsa`OsXJ}~r zZu@=Ec#b?5*2n>+BfHRXpPFb*i;&HhCk{*>9*9*?Up@{i5Wnr_iB1La`Mc z%^z~qq~%y8PPs2hHtD-UP%^-QmCel(q1jXrz)kZ%$tvv-@~?GD>(jIre|=!w;$aFo zBhJZK27MuEZfDfqJ)37m6H)sBGiu&af9XoLs>oa7<|luP+Q#;-_iQa*4zAHIT1}llPkZi1 zX~HZ}@BbTxs=|Up`yVOmdZ^*)fNurpWxW_!+|NPw@&5yK_>#!V71I#*%k>H^)Y|2f z>awnyGA0G*NoO;9pU!s+08x(y!y+m{x6oAMV+Hu#Ur&k_`iW{x?uIXYFciF;54G#E z{9D#=p{7aHrX+2;vVOm7ez_OcHc%VI zyf8fV%7H%kJwfES-|NLSUFSr)+*2>Tawiq9Yu9BmVvW9GRrZ~y#@RjFgvYR-^Q|2l zKZ@V-soBLOp4_QVO6xIfhBfnJa^#tAv-ddt=;R3Lt+v}YA;W)WC-{I(opQSTEke;9 z2g|CD?Y@f930{HfCMU;U5gk}w2TW98Z+@y&arC#YxU*3uo9+HE?YT}o!P{<}&cSMb z`|l4N2dtl$7Gonqbw*kah4mL5e$9zFcGNIsqY6mAatr4lV`}UOtFofNUMb}qL~PyQ z2cr=7j(B$M-_GXr$yTg@@C&fv8EHRJ$%(6O`#jSq;gg;6h|nAKMS$gV#=4XJ>NQsE z`{w0|-y0vEzN;l7Hp}xe?bnm`PqaABA8!P}!I@Ux=qf!VvuojGm4@l-m0m8`wiqyU z$ZN0R(ydmoui4Xh4D`H>o;qlK>zR;u!!rhf8Me>U?O*qFdS5`w!_pi zRr!s*)qD`o7q99qJ!h|R?bfrIPXX=}*a#mz{ESh@?L?kb^xwW0hP6SS7JQetW@QPF zTWI9i^Em6aI=$_Q@d`D^!|PTmF8=Ie2pRKywG|oGC@X}hew#gIUpp!VnoTZ}-Vm{y zXvhGLcuY#ZLo8349SWOVOQp1C3(~^Xh@C>a{Ul@HnC-$W7r#2e&Ot`3X=K!lnfWoz zRL#xXx|&cA{|bM<$tpIv+P#qcZtjt9gq0h(fl6YT)vwGWMMf9$Nyz>;N(-P6{u^XhGYty=cap$ zQR5%x;8#ay>~luPJBtMMFeC5AKkX!SK0(<&haJmDQ$JkF2`Wfzccx69eDv)veZT;gJ%qDY*wmjr8_t9mV zf~U{hgmjVweoVTnwEP%RZaT0MRlmJa&W4~wctlb84JVY@1u(BhR!nYi_d)*_M}@gGboe~C2FaoSU`>Yf;+$_|{& z(!hp&PKy^@Z?&PozJ#K)2;K{G&I$#yn+t=niW2|CS+8+DAm+@q1T$+;oi)P^Rh6VW zs7s^w3V(7Xw`$4HA)#2*9h0q(qE}+>)kd$G#3 SlutY{?~w5D*Pu9-FCCu<>yh` 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 Hu0mjfpM?{b diff --git a/samples/Cpp/AssetsManagerTest/proj.ios/main.m b/samples/Cpp/AssetsManagerTest/proj.ios/main.m deleted file mode 100644 index 2f4612f6a2..0000000000 --- a/samples/Cpp/AssetsManagerTest/proj.ios/main.m +++ /dev/null @@ -1,17 +0,0 @@ -// -// main.m -// AssetsManagerTest -// -// Created by minggo on 2/5/13. -// Copyright __MyCompanyName__ 2013. All rights reserved. -// - -#import - -int main(int argc, char *argv[]) { - - NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init]; - int retVal = UIApplicationMain(argc, argv, nil, @"AppController"); - [pool release]; - return retVal; -} diff --git a/samples/Cpp/AssetsManagerTest/proj.win32/AssetsManagerTest.vcxproj b/samples/Cpp/AssetsManagerTest/proj.win32/AssetsManagerTest.vcxproj deleted file mode 100644 index 7851565229..0000000000 --- a/samples/Cpp/AssetsManagerTest/proj.win32/AssetsManagerTest.vcxproj +++ /dev/null @@ -1,217 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {6D37505F-A890-441D-BD3F-A61E2C0469CE} - AssetsManagerTest - - - - Application - Unicode - v100 - v110 - v110_xp - - - Application - Unicode - v100 - v110 - v110_xp - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration).win32\ - $(Configuration).win32\ - false - $(SolutionDir)$(Configuration).win32\ - $(Configuration).win32\ - false - AllRules.ruleset - - - AllRules.ruleset - - - - - $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath) - - - $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath) - - - - _DEBUG;%(PreprocessorDefinitions) - false - Win32 - true - $(IntDir)res.tlb - res.h - - - res_i.c - res_p.c - - - Disabled - $(ProjectDir)..\Classes;$(EngineRoot);$(EngineRoot)external\spidermonkey\include\win32;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;$(EngineRoot)cocos\scripting\javascript\bindings;$(EngineRoot)cocos\scripting\auto-generated\js-bindings;$(EngineRoot)cocos\audio\include;%(AdditionalIncludeDirectories) - WIN32;_WINDOWS;STRICT;DEBUG;_DEBUG;XP_WIN;JS_HAVE___INTN;JS_INTPTR_TYPE=int;COCOS2D_DEBUG=1;COCOS2D_JAVASCRIPT=1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - false - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - 4267;4251;4244;%(DisableSpecificWarnings) - true - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(IntDir);%(AdditionalIncludeDirectories) - - - if not exist "$(OutDir)" mkdir "$(OutDir)" -xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\spidermonkey\prebuilt\win32\*.*" "$(OutDir)" - - - - mozjs-25.0.lib;ws2_32.lib;sqlite3.lib;libcurl_imp.lib;%(AdditionalDependencies) - $(OutDir);%(AdditionalLibraryDirectories) - true - Windows - MachineX86 - - - if not exist "$(OutDir)" mkdir "$(OutDir)" -if exist "$(OutDir)\AssetsManagerTestRes" rd /s /q "$(OutDir)\AssetsManagerTestRes" -mkdir "$(OutDir)\AssetsManagerTestRes" -xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\javascript\script\*.js" "$(OutDir)\AssetsManagerTestRes\" /e /Y -xcopy "$(ProjectDir)..\Resources" "$(OutDir)\AssetsManagerTestRes\" /e /Y - - - Copy js and resource files. - - - - - NDEBUG;%(PreprocessorDefinitions) - false - Win32 - true - $(IntDir)res.tlb - res.h - - - res_i.c - res_p.c - - - $(ProjectDir)..\Classes;$(EngineRoot);$(EngineRoot)external\spidermonkey\include\win32;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;$(EngineRoot)cocos\scripting\javascript\bindings;$(EngineRoot)cocos\scripting\auto-generated\js-bindings;$(EngineRoot)cocos\audio\include;%(AdditionalIncludeDirectories) - WIN32;_WINDOWS;STRICT;NDEBUG;XP_WIN;JS_HAVE___INTN;JS_INTPTR_TYPE=int;COCOS2D_JAVASCRIPT=1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - - - MultiThreadedDLL - - - Level3 - - - 4267;4251;4244;%(DisableSpecificWarnings) - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(IntDir);%(AdditionalIncludeDirectories) - - - if not exist "$(OutDir)" mkdir "$(OutDir)" -xcopy /Y /Q "$(EngineRoot)external\spidermonkey\prebuilt\win32\*.*" "$(OutDir)" - - - - mozjs-25.0.lib;ws2_32.lib;sqlite3.lib;libcurl_imp.lib;%(AdditionalDependencies) - $(OutDir);%(AdditionalLibraryDirectories) - Windows - MachineX86 - true - - - if not exist "$(OutDir)" mkdir "$(OutDir)" -if exist "$(OutDir)\AssetsManagerTestRes" rd /s /q "$(OutDir)\AssetsManagerTestRes" -mkdir "$(OutDir)\AssetsManagerTestRes" -xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\javascript\script\*.js" "$(OutDir)\AssetsManagerTestRes\" /e /Y -xcopy "$(ProjectDir)..\Resources" "$(OutDir)\AssetsManagerTestRes\" /e /Y - Copy js and resource files. - - - - - - - - - - - - - - - - - - - - {98a51ba8-fc3a-415b-ac8f-8c7bd464e93e} - false - - - {f8edd7fa-9a51-4e80-baeb-860825d2eac6} - - - {625f7391-9a91-48a1-8cfc-79508c822637} - - - {39379840-825a-45a0-b363-c09ffef864bd} - - - {632a8f38-d0f0-4d22-86b3-d69f5e6bf63a} - - - {21b2c324-891f-48ea-ad1a-5ae13de12e28} - - - {207bc7a9-ccf1-4f2f-a04d-45f72242ae25} - - - - - - \ No newline at end of file diff --git a/samples/Cpp/AssetsManagerTest/proj.win32/AssetsManagerTest.vcxproj.filters b/samples/Cpp/AssetsManagerTest/proj.win32/AssetsManagerTest.vcxproj.filters deleted file mode 100644 index de7f9d6f3e..0000000000 --- a/samples/Cpp/AssetsManagerTest/proj.win32/AssetsManagerTest.vcxproj.filters +++ /dev/null @@ -1,44 +0,0 @@ - - - - - {ca9c9e15-d942-43a1-aa7a-5f0b74ca1afd} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;jpg;jpeg;jpe;png;manifest - - - {ccb2323b-1cfa-41ea-bcf4-ba5f07309396} - - - {e93a77e1-af1e-4400-87d3-504b62ebdbb0} - - - - - win32 - - - Classes - - - - - win32 - - - Classes - - - win32 - - - - - resource - - - - - resource - - - \ No newline at end of file diff --git a/samples/Cpp/AssetsManagerTest/proj.win32/AssetsManagerTest.vcxproj.user b/samples/Cpp/AssetsManagerTest/proj.win32/AssetsManagerTest.vcxproj.user deleted file mode 100644 index 806c7a2dd6..0000000000 --- a/samples/Cpp/AssetsManagerTest/proj.win32/AssetsManagerTest.vcxproj.user +++ /dev/null @@ -1,11 +0,0 @@ - - - - $(OutDir)\AssetsManagerTestRes - WindowsLocalDebugger - - - $(OutDir)\AssetsManagerTestRes - WindowsLocalDebugger - - \ No newline at end of file diff --git a/samples/Cpp/AssetsManagerTest/proj.win32/main.cpp b/samples/Cpp/AssetsManagerTest/proj.win32/main.cpp deleted file mode 100644 index 48e2af43a1..0000000000 --- a/samples/Cpp/AssetsManagerTest/proj.win32/main.cpp +++ /dev/null @@ -1,37 +0,0 @@ -#include "main.h" -#include "AppDelegate.h" -#include "CCEGLView.h" - -USING_NS_CC; - -// uncomment below line, open debug console -// #define USE_WIN32_CONSOLE - -int APIENTRY _tWinMain(HINSTANCE hInstance, - HINSTANCE hPrevInstance, - LPTSTR lpCmdLine, - int nCmdShow) -{ - UNREFERENCED_PARAMETER(hPrevInstance); - UNREFERENCED_PARAMETER(lpCmdLine); - -#ifdef USE_WIN32_CONSOLE - AllocConsole(); - freopen("CONIN$", "r", stdin); - freopen("CONOUT$", "w", stdout); - freopen("CONOUT$", "w", stderr); -#endif - - // create the application instance - AppDelegate app; - EGLView eglView; - eglView.init("AssetsManagerTest",900,640); - - int ret = Application::getInstance()->run(); - -#ifdef USE_WIN32_CONSOLE - FreeConsole(); -#endif - - return ret; -} diff --git a/samples/Cpp/AssetsManagerTest/proj.win32/res.rc b/samples/Cpp/AssetsManagerTest/proj.win32/res.rc deleted file mode 100644 index 8bb32cb5e8..0000000000 --- a/samples/Cpp/AssetsManagerTest/proj.win32/res.rc +++ /dev/null @@ -1,86 +0,0 @@ -// Microsoft Visual C++ generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#define APSTUDIO_HIDDEN_SYMBOLS -#include "windows.h" -#undef APSTUDIO_HIDDEN_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) -#endif //_WIN32 - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE -BEGIN - "resource.h\0" -END - -#endif // APSTUDIO_INVOKED - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -IDR_MAINFRAME ICON "res\\res.ico" - -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,0,0,1 - PRODUCTVERSION 1,0,0,1 - FILEFLAGSMASK 0x3fL -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - FILEOS 0x4L - FILETYPE 0x2L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904B0" - BEGIN - VALUE "CompanyName", "\0" - VALUE "FileDescription", "res Module\0" - VALUE "FileVersion", "1, 0, 0, 1\0" - VALUE "InternalName", "res\0" - VALUE "LegalCopyright", "Copyright \0" - VALUE "OriginalFilename", "AssetsManagerTest.exe\0" - VALUE "ProductName", "AssetsManagerTest Module\0" - VALUE "ProductVersion", "1, 0, 0, 1\0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x0409, 0x04B0 - END -END - -///////////////////////////////////////////////////////////////////////////// -#endif // !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) diff --git a/samples/Cpp/AssetsManagerTest/proj.win32/res/res.ico b/samples/Cpp/AssetsManagerTest/proj.win32/res/res.ico deleted file mode 100644 index feaf932a7465e435af6271bd8204c0145731a6eb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 47629 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 -#include - -#include "HelloWorldScene.h" -#include "AppMacros.h" - -USING_NS_CC; -using namespace std; - -AppDelegate::AppDelegate() { - -} - -AppDelegate::~AppDelegate() -{ -} - -bool AppDelegate::applicationDidFinishLaunching() { - // initialize director - auto director = Director::getInstance(); - auto glView = EGLView::getInstance(); - - director->setOpenGLView(glView); - - // Set the design resolution - glView->setDesignResolutionSize(designResolutionSize.width, designResolutionSize.height, ResolutionPolicy::NO_BORDER); - - Size frameSize = glView->getFrameSize(); - - vector searchPath; - - // In this demo, we select resource according to the frame's height. - // If the resource size is different from design resolution size, you need to set contentScaleFactor. - // We use the ratio of resource's height to the height of design resolution, - // this can make sure that the resource's height could fit for the height of design resolution. - - // if the frame's height is larger than the height of medium resource size, select large resource. - if (frameSize.height > mediumResource.size.height) - { - searchPath.push_back(largeResource.directory); - - director->setContentScaleFactor(MIN(largeResource.size.height/designResolutionSize.height, largeResource.size.width/designResolutionSize.width)); - } - // if the frame's height is larger than the height of small resource size, select medium resource. - else if (frameSize.height > smallResource.size.height) - { - searchPath.push_back(mediumResource.directory); - - director->setContentScaleFactor(MIN(mediumResource.size.height/designResolutionSize.height, mediumResource.size.width/designResolutionSize.width)); - } - // if the frame's height is smaller than the height of medium resource size, select small resource. - else - { - searchPath.push_back(smallResource.directory); - - director->setContentScaleFactor(MIN(smallResource.size.height/designResolutionSize.height, smallResource.size.width/designResolutionSize.width)); - } - - // set searching path - FileUtils::getInstance()->setSearchPaths(searchPath); - - // turn on display FPS - director->setDisplayStats(true); - - // set FPS. the default value is 1.0/60 if you don't call this - director->setAnimationInterval(1.0 / 60); - - // create a scene. it's an autorelease object - auto scene = HelloWorld::scene(); - - // run - director->runWithScene(scene); - - return true; -} - -// This function will be called when the app is inactive. When comes a phone call,it's be invoked too -void AppDelegate::applicationDidEnterBackground() { - Director::getInstance()->stopAnimation(); - - // if you use SimpleAudioEngine, it must be pause - // SimpleAudioEngine::sharedEngine()->pauseBackgroundMusic(); -} - -// this function will be called when the app is active again -void AppDelegate::applicationWillEnterForeground() { - Director::getInstance()->startAnimation(); - - // if you use SimpleAudioEngine, it must resume here - // SimpleAudioEngine::sharedEngine()->resumeBackgroundMusic(); -} diff --git a/samples/Cpp/HelloCpp/Classes/AppMacros.h b/samples/Cpp/HelloCpp/Classes/AppMacros.h deleted file mode 100644 index 6e6aa0ea2e..0000000000 --- a/samples/Cpp/HelloCpp/Classes/AppMacros.h +++ /dev/null @@ -1,56 +0,0 @@ -#ifndef __APPMACROS_H__ -#define __APPMACROS_H__ - -#include "cocos2d.h" - -/* For demonstrating using one design resolution to match different resources, - or one resource to match different design resolutions. - - [Situation 1] Using one design resolution to match different resources. - Please look into Appdelegate::applicationDidFinishLaunching. - We check current device frame size to decide which resource need to be selected. - So if you want to test this situation which said in title '[Situation 1]', - you should change ios simulator to different device(e.g. iphone, iphone-retina3.5, iphone-retina4.0, ipad, ipad-retina), - or change the window size in "proj.XXX/main.cpp" by "CCEGLView::setFrameSize" if you are using win32 or linux plaform - and modify "proj.mac/AppController.mm" by changing the window rectangle. - - [Situation 2] Using one resource to match different design resolutions. - The coordinates in your codes is based on your current design resolution rather than resource size. - Therefore, your design resolution could be very large and your resource size could be small. - To test this, just define the marco 'TARGET_DESIGN_RESOLUTION_SIZE' to 'DESIGN_RESOLUTION_2048X1536' - and open iphone simulator or create a window of 480x320 size. - - [Note] Normally, developer just need to define one design resolution(e.g. 960x640) with one or more resources. - */ - -#define DESIGN_RESOLUTION_480X320 0 -#define DESIGN_RESOLUTION_1024X768 1 -#define DESIGN_RESOLUTION_2048X1536 2 - -/* If you want to switch design resolution, change next line */ -#define TARGET_DESIGN_RESOLUTION_SIZE DESIGN_RESOLUTION_480X320 - -typedef struct tagResource -{ - cocos2d::Size size; - char directory[100]; -}Resource; - -static Resource smallResource = { cocos2d::Size(480, 320), "iphone" }; -static Resource mediumResource = { cocos2d::Size(1024, 768), "ipad" }; -static Resource largeResource = { cocos2d::Size(2048, 1536), "ipadhd" }; - -#if (TARGET_DESIGN_RESOLUTION_SIZE == DESIGN_RESOLUTION_480X320) -static cocos2d::Size designResolutionSize = cocos2d::Size(480, 320); -#elif (TARGET_DESIGN_RESOLUTION_SIZE == DESIGN_RESOLUTION_1024X768) -static cocos2d::Size designResolutionSize = cocos2d::Size(1024, 768); -#elif (TARGET_DESIGN_RESOLUTION_SIZE == DESIGN_RESOLUTION_2048X1536) -static cocos2d::Size designResolutionSize = cocos2d::Size(2048, 1536); -#else -#error unknown target design resolution! -#endif - -// The font size 24 is designed for small resolution, so we should change it to fit for current design resolution -#define TITLE_FONT_SIZE (cocos2d::EGLView::getInstance()->getDesignResolutionSize().width / smallResource.size.width * 24) - -#endif /* __APPMACROS_H__ */ diff --git a/samples/Cpp/HelloCpp/Classes/HelloWorldScene.cpp b/samples/Cpp/HelloCpp/Classes/HelloWorldScene.cpp deleted file mode 100644 index 077a92aa11..0000000000 --- a/samples/Cpp/HelloCpp/Classes/HelloWorldScene.cpp +++ /dev/null @@ -1,88 +0,0 @@ -#include "HelloWorldScene.h" -#include "AppMacros.h" - -#include "CCEventListenerTouch.h" - -USING_NS_CC; - - -Scene* HelloWorld::scene() -{ - // 'scene' is an autorelease object - auto scene = Scene::create(); - - // 'layer' is an autorelease object - HelloWorld *layer = HelloWorld::create(); - - // add layer as a child to scene - scene->addChild(layer); - - // return the scene - return scene; -} - -// on "init" you need to initialize your instance -bool HelloWorld::init() -{ - ////////////////////////////// - // 1. super init first - if ( !Layer::init() ) - { - return false; - } - - auto visibleSize = Director::getInstance()->getVisibleSize(); - auto origin = Director::getInstance()->getVisibleOrigin(); - - ///////////////////////////// - // 2. add a menu item with "X" image, which is clicked to quit the program - // you may modify it. - - // add a "close" icon to exit the progress. it's an autorelease object - auto closeItem = MenuItemImage::create( - "CloseNormal.png", - "CloseSelected.png", - CC_CALLBACK_1(HelloWorld::menuCloseCallback,this)); - - closeItem->setPosition(origin + Point(visibleSize) - Point(closeItem->getContentSize() / 2)); - - // create menu, it's an autorelease object - auto menu = Menu::create(closeItem, NULL); - menu->setPosition(Point::ZERO); - this->addChild(menu, 1); - - ///////////////////////////// - // 3. add your codes below... - - // add a label shows "Hello World" - // create and initialize a label - - auto label = LabelTTF::create("Hello World", "Arial", TITLE_FONT_SIZE); - - // position the label on the center of the screen - label->setPosition(Point(origin.x + visibleSize.width/2, - origin.y + visibleSize.height - label->getContentSize().height)); - - // add the label as a child to this layer - this->addChild(label, 1); - - // add "HelloWorld" splash screen" - auto sprite = Sprite::create("HelloWorld.png"); - - // position the sprite on the center of the screen - sprite->setPosition(Point(visibleSize / 2) + origin); - - // add the sprite as a child to this layer - this->addChild(sprite); - - return true; -} - -void HelloWorld::menuCloseCallback(Object* sender) -{ - Director::getInstance()->end(); - -#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) - exit(0); -#endif -} diff --git a/samples/Cpp/HelloCpp/Classes/HelloWorldScene.h b/samples/Cpp/HelloCpp/Classes/HelloWorldScene.h deleted file mode 100644 index 876073cdb5..0000000000 --- a/samples/Cpp/HelloCpp/Classes/HelloWorldScene.h +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef __HELLOWORLD_SCENE_H__ -#define __HELLOWORLD_SCENE_H__ - -#include "cocos2d.h" - -class HelloWorld : public cocos2d::Layer -{ -public: - // Here's a difference. Method 'init' in cocos2d-x returns bool, instead of returning 'id' in cocos2d-iphone - virtual bool init(); - - // there's no 'id' in cpp, so we recommend returning the class instance pointer - static cocos2d::Scene* scene(); - - // a selector callback - void menuCloseCallback(Object* sender); - - // implement the "static node()" method manually - CREATE_FUNC(HelloWorld); -}; - -#endif // __HELLOWORLD_SCENE_H__ diff --git a/samples/Cpp/HelloCpp/Resources/ipad/HelloWorld.png.REMOVED.git-id b/samples/Cpp/HelloCpp/Resources/ipad/HelloWorld.png.REMOVED.git-id deleted file mode 100644 index fda9923fa3..0000000000 --- a/samples/Cpp/HelloCpp/Resources/ipad/HelloWorld.png.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -709d78b7f3eab27056a98d63e9153b35d57b84bc \ No newline at end of file diff --git a/samples/Cpp/HelloCpp/Resources/ipadhd/HelloWorld.png.REMOVED.git-id b/samples/Cpp/HelloCpp/Resources/ipadhd/HelloWorld.png.REMOVED.git-id deleted file mode 100644 index 45e6087f95..0000000000 --- a/samples/Cpp/HelloCpp/Resources/ipadhd/HelloWorld.png.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -7aa1e9dc799acf384a1c4603054242cc09c1b63e \ No newline at end of file diff --git a/samples/Cpp/HelloCpp/Resources/iphone/HelloWorld.png.REMOVED.git-id b/samples/Cpp/HelloCpp/Resources/iphone/HelloWorld.png.REMOVED.git-id deleted file mode 100644 index d391882e7d..0000000000 --- a/samples/Cpp/HelloCpp/Resources/iphone/HelloWorld.png.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -9d6facb31897d010352e7b57f4a82715c260408a \ No newline at end of file diff --git a/samples/Cpp/HelloCpp/proj.android/.project b/samples/Cpp/HelloCpp/proj.android/.project deleted file mode 100644 index 908b979a53..0000000000 --- a/samples/Cpp/HelloCpp/proj.android/.project +++ /dev/null @@ -1,60 +0,0 @@ - - - HelloCpp - - - - - - com.android.ide.eclipse.adt.ResourceManagerBuilder - - - - - com.android.ide.eclipse.adt.PreCompilerBuilder - - - - - org.eclipse.jdt.core.javabuilder - - - - - com.android.ide.eclipse.adt.ApkBuilder - - - - - org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder - full,incremental, - - - - - - com.android.ide.eclipse.adt.AndroidNature - org.eclipse.jdt.core.javanature - org.eclipse.cdt.core.cnature - org.eclipse.cdt.core.ccnature - org.eclipse.cdt.managedbuilder.core.managedBuildNature - org.eclipse.cdt.managedbuilder.core.ScannerConfigNature - - - - Classes - 2 - COCOS2DX/samples/Cpp/HelloCpp/Classes - - - cocos2dx - 2 - COCOS2DX/cocos2dx - - - extensions - 2 - COCOS2DX/extensions - - - diff --git a/samples/Cpp/HelloCpp/proj.android/AndroidManifest.xml b/samples/Cpp/HelloCpp/proj.android/AndroidManifest.xml deleted file mode 100644 index 79a643c03a..0000000000 --- a/samples/Cpp/HelloCpp/proj.android/AndroidManifest.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/samples/Cpp/HelloCpp/proj.android/build.xml b/samples/Cpp/HelloCpp/proj.android/build.xml deleted file mode 100644 index e225e378da..0000000000 --- a/samples/Cpp/HelloCpp/proj.android/build.xml +++ /dev/null @@ -1,85 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/samples/Cpp/HelloCpp/proj.android/jni/Android.mk b/samples/Cpp/HelloCpp/proj.android/jni/Android.mk deleted file mode 100644 index cfd4cb14b5..0000000000 --- a/samples/Cpp/HelloCpp/proj.android/jni/Android.mk +++ /dev/null @@ -1,20 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE := hellocpp_shared - -LOCAL_MODULE_FILENAME := libhellocpp - -LOCAL_SRC_FILES := hellocpp/main.cpp \ - ../../Classes/AppDelegate.cpp \ - ../../Classes/HelloWorldScene.cpp - -LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../Classes - -LOCAL_WHOLE_STATIC_LIBRARIES := cocos2dx_static cocosdenshion_static - -include $(BUILD_SHARED_LIBRARY) - -$(call import-module,2d) -$(call import-module,audio/android) diff --git a/samples/Cpp/HelloCpp/proj.android/jni/Application.mk b/samples/Cpp/HelloCpp/proj.android/jni/Application.mk deleted file mode 100644 index 74af9626ab..0000000000 --- a/samples/Cpp/HelloCpp/proj.android/jni/Application.mk +++ /dev/null @@ -1,5 +0,0 @@ -APP_STL := gnustl_static - -# add -Wno-literal-suffix to avoid warning: warning: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wliteral-suffix] -# in NDK_ROOT/arch-arm/usr/include/sys/cdefs_elf.h:35:28: when using ndk-r9 -APP_CPPFLAGS := -frtti -DCOCOS2D_DEBUG=1 -std=c++11 -Wno-literal-suffix -fsigned-char diff --git a/samples/Cpp/HelloCpp/proj.android/jni/hellocpp/main.cpp b/samples/Cpp/HelloCpp/proj.android/jni/hellocpp/main.cpp deleted file mode 100644 index 2b344d9e04..0000000000 --- a/samples/Cpp/HelloCpp/proj.android/jni/hellocpp/main.cpp +++ /dev/null @@ -1,16 +0,0 @@ -#include "AppDelegate.h" -#include "platform/android/jni/JniHelper.h" -#include -#include - -#include "cocos2d.h" - -#define LOG_TAG "main" -#define LOGD(...) __android_log_print(ANDROID_LOG_DEBUG,LOG_TAG,__VA_ARGS__) - -using namespace cocos2d; - -void cocos_android_app_init (struct android_app* app) { - LOGD("cocos_android_app_init"); - AppDelegate *pAppDelegate = new AppDelegate(); -} diff --git a/samples/Cpp/HelloCpp/proj.android/jni/list.sh b/samples/Cpp/HelloCpp/proj.android/jni/list.sh deleted file mode 100755 index b29f678cb8..0000000000 --- a/samples/Cpp/HelloCpp/proj.android/jni/list.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash - -append_str=' \' - -list_alldir() -{ - for file in $1/* - do - if [ -f $file ]; then - echo $file$append_str | grep .cpp - fi - - if [ -d $file ]; then - list_alldir $file - fi - done -} - -if [ $# -gt 0 ]; then - list_alldir "$1" -else - list_alldir "." -fi diff --git a/samples/Cpp/HelloCpp/proj.android/ndkgdb.sh b/samples/Cpp/HelloCpp/proj.android/ndkgdb.sh deleted file mode 100755 index de49075f36..0000000000 --- a/samples/Cpp/HelloCpp/proj.android/ndkgdb.sh +++ /dev/null @@ -1,47 +0,0 @@ -APPNAME="HelloCpp" -APP_ANDROID_NAME="org.cocos2dx.hellocpp" - -if [ -z "${SDK_ROOT+aaa}" ]; then -# ... if SDK_ROOT is not set, use "$HOME/bin/android-sdk" - SDK_ROOT="$HOME/bin/android-sdk" -fi - -if [ -z "${NDK_ROOT+aaa}" ]; then -# ... if NDK_ROOT is not set, use "$HOME/bin/android-ndk" - NDK_ROOT="$HOME/bin/android-ndk" -fi - -if [ -z "${COCOS2DX_ROOT+aaa}" ]; then -# ... if COCOS2DX_ROOT is not set -# ... find current working directory - DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -# ... use paths relative to current directory - COCOS2DX_ROOT="$DIR/../../../.." - APP_ROOT="$DIR/.." - APP_ANDROID_ROOT="$DIR" -else - APP_ROOT="$COCOS2DX_ROOT/samples/$APPNAME" - APP_ANDROID_ROOT="$COCOS2DX_ROOT/samples/$APPNAME/proj.android" -fi - -echo "NDK_ROOT = $NDK_ROOT" -echo "SDK_ROOT = $SDK_ROOT" -echo "COCOS2DX_ROOT = $COCOS2DX_ROOT" -echo "APP_ROOT = $APP_ROOT" -echo "APP_ANDROID_ROOT = $APP_ANDROID_ROOT" -echo "APP_ANDROID_NAME = $APP_ANDROID_NAME" - -echo -echo "Killing and restarting ${APP_ANDROID_NAME}" -echo - -set -x - -"${SDK_ROOT}"/platform-tools/adb shell am force-stop "${APP_ANDROID_NAME}" - -NDK_MODULE_PATH="${COCOS2DX_ROOT}":"${COCOS2DX_ROOT}"/cocos2dx/platform/third_party/android/prebuilt \ - "${NDK_ROOT}"/ndk-gdb \ - --adb="${SDK_ROOT}"/platform-tools/adb \ - --verbose \ - --start \ - --force diff --git a/samples/Cpp/HelloCpp/proj.android/res/values/strings.xml b/samples/Cpp/HelloCpp/proj.android/res/values/strings.xml deleted file mode 100644 index d70da2da7a..0000000000 --- a/samples/Cpp/HelloCpp/proj.android/res/values/strings.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - HelloCpp - diff --git a/samples/Cpp/HelloCpp/proj.android/src/org/cocos2dx/hellocpp/Cocos2dxActivity.java b/samples/Cpp/HelloCpp/proj.android/src/org/cocos2dx/hellocpp/Cocos2dxActivity.java deleted file mode 100644 index ed4f339cee..0000000000 --- a/samples/Cpp/HelloCpp/proj.android/src/org/cocos2dx/hellocpp/Cocos2dxActivity.java +++ /dev/null @@ -1,32 +0,0 @@ -package org.cocos2dx.hellocpp; - -import android.app.NativeActivity; -import android.os.Bundle; - -public class Cocos2dxActivity extends NativeActivity{ - - @Override - protected void onCreate(Bundle savedInstanceState) { - // TODO Auto-generated method stub - super.onCreate(savedInstanceState); - - //For supports translucency - - //1.change "attribs" in cocos\2d\platform\android\nativeactivity.cpp - /*const EGLint attribs[] = { - EGL_SURFACE_TYPE, EGL_WINDOW_BIT, - EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT, - //EGL_BLUE_SIZE, 5, -->delete - //EGL_GREEN_SIZE, 6, -->delete - //EGL_RED_SIZE, 5, -->delete - EGL_BUFFER_SIZE, 32, //-->new field - EGL_DEPTH_SIZE, 16, - EGL_STENCIL_SIZE, 8, - EGL_NONE - };*/ - - //2.Set the format of window - // getWindow().setFormat(PixelFormat.TRANSLUCENT); - - } -} diff --git a/samples/Cpp/HelloCpp/proj.ios/AppController.mm b/samples/Cpp/HelloCpp/proj.ios/AppController.mm deleted file mode 100644 index 5e2010ba4c..0000000000 --- a/samples/Cpp/HelloCpp/proj.ios/AppController.mm +++ /dev/null @@ -1,134 +0,0 @@ -/**************************************************************************** - Copyright (c) 2010 cocos2d-x.org - - http://www.cocos2d-x.org - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - THE SOFTWARE. - ****************************************************************************/ -#import -#import "AppController.h" -#import "cocos2d.h" -#import "EAGLView.h" -#import "AppDelegate.h" - -#import "RootViewController.h" - -@implementation AppController - -#pragma mark - -#pragma mark Application lifecycle - -// cocos2d application instance -static AppDelegate s_sharedApplication; - -- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { - - // Override point for customization after application launch. - - // Add the view controller's view to the window and display. - window = [[UIWindow alloc] initWithFrame: [[UIScreen mainScreen] bounds]]; - CCEAGLView *__glView = [CCEAGLView viewWithFrame: [window bounds] - pixelFormat: kEAGLColorFormatRGBA8 - depthFormat: GL_DEPTH_COMPONENT16 - preserveBackbuffer: NO - sharegroup:nil - multiSampling:NO - numberOfSamples:0]; - - // Use RootViewController manage CCEAGLView - viewController = [[RootViewController alloc] initWithNibName:nil bundle:nil]; - viewController.wantsFullScreenLayout = YES; - viewController.view = __glView; - - // Set RootViewController to window - if ( [[UIDevice currentDevice].systemVersion floatValue] < 6.0) - { - // warning: addSubView doesn't work on iOS6 - [window addSubview: viewController.view]; - } - else - { - // use this method on ios6 - [window setRootViewController:viewController]; - } - - [window makeKeyAndVisible]; - - [[UIApplication sharedApplication] setStatusBarHidden: YES]; - - cocos2d::Application::getInstance()->run(); - return YES; -} - - -- (void)applicationWillResignActive:(UIApplication *)application { - /* - Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state. - Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game. - */ - cocos2d::Director::getInstance()->pause(); -} - -- (void)applicationDidBecomeActive:(UIApplication *)application { - /* - Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface. - */ - cocos2d::Director::getInstance()->resume(); -} - -- (void)applicationDidEnterBackground:(UIApplication *)application { - /* - Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later. - If your application supports background execution, called instead of applicationWillTerminate: when the user quits. - */ - cocos2d::Application::getInstance()->applicationDidEnterBackground(); -} - -- (void)applicationWillEnterForeground:(UIApplication *)application { - /* - Called as part of transition from the background to the inactive state: here you can undo many of the changes made on entering the background. - */ - cocos2d::Application::getInstance()->applicationWillEnterForeground(); -} - -- (void)applicationWillTerminate:(UIApplication *)application { - /* - Called when the application is about to terminate. - See also applicationDidEnterBackground:. - */ -} - - -#pragma mark - -#pragma mark Memory management - -- (void)applicationDidReceiveMemoryWarning:(UIApplication *)application { - /* - Free up as much memory as possible by purging cached data objects that can be recreated (or reloaded from disk) later. - */ -} - - -- (void)dealloc { - [super dealloc]; -} - - -@end - diff --git a/samples/Cpp/HelloCpp/proj.ios/HelloCpp_Prefix.pch b/samples/Cpp/HelloCpp/proj.ios/HelloCpp_Prefix.pch deleted file mode 100644 index b8914281d2..0000000000 --- a/samples/Cpp/HelloCpp/proj.ios/HelloCpp_Prefix.pch +++ /dev/null @@ -1,8 +0,0 @@ -// -// Prefix header for all source files of the 'HelloWorld' target in the 'HelloWorld' project -// - -#ifdef __OBJC__ - #import - #import -#endif diff --git a/samples/Cpp/HelloCpp/proj.ios/RootViewController.mm b/samples/Cpp/HelloCpp/proj.ios/RootViewController.mm deleted file mode 100644 index 4984955c8a..0000000000 --- a/samples/Cpp/HelloCpp/proj.ios/RootViewController.mm +++ /dev/null @@ -1,97 +0,0 @@ -/**************************************************************************** - Copyright (c) 2010-2011 cocos2d-x.org - Copyright (c) 2010 Ricardo Quesada - - http://www.cocos2d-x.org - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - THE SOFTWARE. - ****************************************************************************/ - -#import "RootViewController.h" - - -@implementation RootViewController - -/* - // The designated initializer. Override if you create the controller programmatically and want to perform customization that is not appropriate for viewDidLoad. -- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil { - if ((self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil])) { - // Custom initialization - } - return self; -} -*/ - -/* -// Implement loadView to create a view hierarchy programmatically, without using a nib. -- (void)loadView { -} -*/ - -/* -// Implement viewDidLoad to do additional setup after loading the view, typically from a nib. -- (void)viewDidLoad { - [super viewDidLoad]; -} - -*/ -// Override to allow orientations other than the default portrait orientation. -// This method is deprecated on ios6 -- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { - return UIInterfaceOrientationIsLandscape( interfaceOrientation ); -} - -// For ios6.0 and higher, use supportedInterfaceOrientations & shouldAutorotate instead -- (NSUInteger) supportedInterfaceOrientations -{ -#ifdef __IPHONE_6_0 - return UIInterfaceOrientationMaskAllButUpsideDown; -#endif -} - -- (BOOL) shouldAutorotate { - return YES; -} - -//fix not hide status on ios7 -- (BOOL)prefersStatusBarHidden -{ - return YES; -} - -- (void)didReceiveMemoryWarning { - // Releases the view if it doesn't have a superview. - [super didReceiveMemoryWarning]; - - // Release any cached data, images, etc that aren't in use. -} - -- (void)viewDidUnload { - [super viewDidUnload]; - // Release any retained subviews of the main view. - // e.g. self.myOutlet = nil; -} - - -- (void)dealloc { - [super dealloc]; -} - - -@end diff --git a/samples/Cpp/HelloCpp/proj.ios/main.m b/samples/Cpp/HelloCpp/proj.ios/main.m deleted file mode 100644 index bd577a036e..0000000000 --- a/samples/Cpp/HelloCpp/proj.ios/main.m +++ /dev/null @@ -1,17 +0,0 @@ -// -// main.m -// iphone -// -// Created by Walzer on 10-11-16. -// Copyright 2010 __MyCompanyName__. All rights reserved. -// - -#import - -int main(int argc, char *argv[]) { - - NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init]; - int retVal = UIApplicationMain(argc, argv, nil, @"AppController"); - [pool release]; - return retVal; -} diff --git a/samples/Cpp/HelloCpp/proj.linux/main.cpp b/samples/Cpp/HelloCpp/proj.linux/main.cpp deleted file mode 100644 index eaac21e713..0000000000 --- a/samples/Cpp/HelloCpp/proj.linux/main.cpp +++ /dev/null @@ -1,18 +0,0 @@ -#include "../Classes/AppDelegate.h" -#include "cocos2d.h" - -#include -#include -#include -#include - -USING_NS_CC; - -int main(int argc, char **argv) -{ - // create the application instance - AppDelegate app; - EGLView eglView; - eglView.init("HelloCpp",900,640); - return Application::getInstance()->run(); -} diff --git a/samples/Cpp/HelloCpp/proj.mac/HelloCpp_Prefix.pch b/samples/Cpp/HelloCpp/proj.mac/HelloCpp_Prefix.pch deleted file mode 100644 index 46c36a7e99..0000000000 --- a/samples/Cpp/HelloCpp/proj.mac/HelloCpp_Prefix.pch +++ /dev/null @@ -1,7 +0,0 @@ -// -// Prefix header for all source files of the 'Paralaxer' target in the 'Paralaxer' project -// - -#ifdef __OBJC__ - #import -#endif diff --git a/samples/Cpp/HelloCpp/proj.mac/main.cpp b/samples/Cpp/HelloCpp/proj.mac/main.cpp deleted file mode 100644 index 4bba4a37b3..0000000000 --- a/samples/Cpp/HelloCpp/proj.mac/main.cpp +++ /dev/null @@ -1,36 +0,0 @@ -/**************************************************************************** - Copyright (c) 2010 cocos2d-x.org - - http://www.cocos2d-x.org - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - THE SOFTWARE. - ****************************************************************************/ - -#include "AppDelegate.h" - -USING_NS_CC; - -int main(int argc, char *argv[]) -{ - AppDelegate app; - EGLView eglView; - eglView.init("HelloCpp",900,640); - return Application::getInstance()->run(); -} - diff --git a/samples/Cpp/HelloCpp/proj.win32/HelloCpp.vcxproj b/samples/Cpp/HelloCpp/proj.win32/HelloCpp.vcxproj deleted file mode 100644 index 6da099a164..0000000000 --- a/samples/Cpp/HelloCpp/proj.win32/HelloCpp.vcxproj +++ /dev/null @@ -1,147 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {B8BF9E81-35FD-4582-BA1C-B85FA365BABB} - HelloCppwin32 - Win32Proj - - - - Application - Unicode - true - v100 - v110 - v110_xp - - - Application - Unicode - v100 - v110 - v110_xp - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration).win32\ - $(Configuration).win32\ - true - $(SolutionDir)$(Configuration).win32\ - $(Configuration).win32\ - false - AllRules.ruleset - - - AllRules.ruleset - - - - - $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath) - - - $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath) - - - - Disabled - ..\Classes;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - 4267;4251;4244;%(DisableSpecificWarnings) - - - $(OutDir)$(ProjectName).exe - $(OutDir);%(AdditionalLibraryDirectories) - true - Windows - MachineX86 - libcocos2d.lib;libchipmunk.lib;%(AdditionalDependencies) - - - - - - - - - MaxSpeed - true - ..\Classes;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - 4267;4251;4244;%(DisableSpecificWarnings) - - - libcocos2d.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).exe - $(OutDir);%(AdditionalLibraryDirectories) - true - Windows - true - true - MachineX86 - - - - - - - - - - - - - - - - - - - - {98a51ba8-fc3a-415b-ac8f-8c7bd464e93e} - false - - - {207bc7a9-ccf1-4f2f-a04d-45f72242ae25} - - - - - - \ No newline at end of file diff --git a/samples/Cpp/HelloCpp/proj.win32/HelloCpp.vcxproj.filters b/samples/Cpp/HelloCpp/proj.win32/HelloCpp.vcxproj.filters deleted file mode 100644 index eb52c5e24c..0000000000 --- a/samples/Cpp/HelloCpp/proj.win32/HelloCpp.vcxproj.filters +++ /dev/null @@ -1,38 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - - - Classes - - - Classes - - - win32 - - - - - Classes - - - Classes - - - win32 - - - Classes - - - \ No newline at end of file diff --git a/samples/Cpp/HelloCpp/proj.win32/HelloCpp.vcxproj.user b/samples/Cpp/HelloCpp/proj.win32/HelloCpp.vcxproj.user deleted file mode 100644 index 32a6296820..0000000000 --- a/samples/Cpp/HelloCpp/proj.win32/HelloCpp.vcxproj.user +++ /dev/null @@ -1,11 +0,0 @@ - - - - $(ProjectDir)..\Resources - WindowsLocalDebugger - - - $(ProjectDir)..\Resources - WindowsLocalDebugger - - \ No newline at end of file diff --git a/samples/Cpp/HelloCpp/proj.win32/main.cpp b/samples/Cpp/HelloCpp/proj.win32/main.cpp deleted file mode 100644 index bcc0e091d4..0000000000 --- a/samples/Cpp/HelloCpp/proj.win32/main.cpp +++ /dev/null @@ -1,20 +0,0 @@ -#include "main.h" -#include "../Classes/AppDelegate.h" -#include "CCEGLView.h" - -USING_NS_CC; - -int APIENTRY _tWinMain(HINSTANCE hInstance, - HINSTANCE hPrevInstance, - LPTSTR lpCmdLine, - int nCmdShow) -{ - UNREFERENCED_PARAMETER(hPrevInstance); - UNREFERENCED_PARAMETER(lpCmdLine); - - // create the application instance - AppDelegate app; - EGLView eglView; - eglView.init("HelloCpp",900,640); - return Application::getInstance()->run(); -} diff --git a/samples/Cpp/SimpleGame/Classes/AppDelegate.cpp b/samples/Cpp/SimpleGame/Classes/AppDelegate.cpp deleted file mode 100644 index 03b9b81ae4..0000000000 --- a/samples/Cpp/SimpleGame/Classes/AppDelegate.cpp +++ /dev/null @@ -1,70 +0,0 @@ -#include "AppDelegate.h" -#include "HelloWorldScene.h" - -USING_NS_CC; - - -AppDelegate::AppDelegate() { - -} - -AppDelegate::~AppDelegate() -{ -} - -bool AppDelegate::applicationDidFinishLaunching() { - // initialize director - auto director = Director::getInstance(); - - director->setOpenGLView(EGLView::getInstance()); - - auto screenSize = EGLView::getInstance()->getFrameSize(); - auto designSize = Size(480, 320); - std::vector searchPaths; - - if (screenSize.height > 320) - { - searchPaths.push_back("hd"); - searchPaths.push_back("sd"); - director->setContentScaleFactor(640.0f/designSize.height); - } - else - { - searchPaths.push_back("sd"); - director->setContentScaleFactor(320.0f/designSize.height); - } - - FileUtils::getInstance()->setSearchPaths(searchPaths); - - EGLView::getInstance()->setDesignResolutionSize(designSize.width, designSize.height, ResolutionPolicy::NO_BORDER); - - // turn on display FPS - director->setDisplayStats(true); - - // set FPS. the default value is 1.0/60 if you don't call this - director->setAnimationInterval(1.0 / 60); - - // create a scene. it's an autorelease object - auto scene = HelloWorld::scene(); - - // run - director->runWithScene(scene); - - return true; -} - -// This function will be called when the app is inactive. When comes a phone call,it's be invoked too -void AppDelegate::applicationDidEnterBackground() { - Director::getInstance()->stopAnimation(); - - // if you use SimpleAudioEngine, it must be pause - // CocosDenshion::SimpleAudioEngine::sharedEngine()->pauseBackgroundMusic(); -} - -// this function will be called when the app is active again -void AppDelegate::applicationWillEnterForeground() { - Director::getInstance()->startAnimation(); - - // if you use SimpleAudioEngine, it must resume here - // CocosDenshion::SimpleAudioEngine::sharedEngine()->resumeBackgroundMusic(); -} diff --git a/samples/Cpp/SimpleGame/Classes/AppDelegate.h b/samples/Cpp/SimpleGame/Classes/AppDelegate.h deleted file mode 100644 index 18ee8aeb63..0000000000 --- a/samples/Cpp/SimpleGame/Classes/AppDelegate.h +++ /dev/null @@ -1,38 +0,0 @@ -#ifndef _APP_DELEGATE_H_ -#define _APP_DELEGATE_H_ - -#include "cocos2d.h" - -/** -@brief The cocos2d Application. - -The reason for implement as private inheritance is to hide some interface call by Director. -*/ -class AppDelegate : private cocos2d::Application -{ -public: - AppDelegate(); - virtual ~AppDelegate(); - - /** - @brief Implement Director and Scene init code here. - @return true Initialize success, app continue. - @return false Initialize failed, app terminate. - */ - virtual bool applicationDidFinishLaunching(); - - /** - @brief The function be called when the application enter background - @param the pointer of the application - */ - virtual void applicationDidEnterBackground(); - - /** - @brief The function be called when the application enter foreground - @param the pointer of the application - */ - virtual void applicationWillEnterForeground(); -}; - -#endif // _APP_DELEGATE_H_ - diff --git a/samples/Cpp/SimpleGame/Classes/GameOverScene.cpp b/samples/Cpp/SimpleGame/Classes/GameOverScene.cpp deleted file mode 100644 index a7b72e8b3c..0000000000 --- a/samples/Cpp/SimpleGame/Classes/GameOverScene.cpp +++ /dev/null @@ -1,93 +0,0 @@ -/**************************************************************************** - Copyright (c) 2010-2011 cocos2d-x.org - Copyright (c) 2010 Ray Wenderlich - - http://www.cocos2d-x.org - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - THE SOFTWARE. - ****************************************************************************/ - -#include "GameOverScene.h" -#include "HelloWorldScene.h" - -using namespace cocos2d; - -bool GameOverScene::init() -{ - if( Scene::init() ) - { - this->_layer = GameOverLayer::create(); - this->_layer->retain(); - this->addChild(_layer); - - return true; - } - else - { - return false; - } -} - -GameOverScene::~GameOverScene() -{ - if (_layer) - { - _layer->release(); - _layer = NULL; - } -} - - -bool GameOverLayer::init() -{ - if ( LayerColor::initWithColor( Color4B(255,255,255,255) ) ) - { - auto winSize = Director::getInstance()->getWinSize(); - this->_label = LabelTTF::create("","Artial", 32); - _label->retain(); - _label->setColor( Color3B(0, 0, 0) ); - _label->setPosition( Point(winSize.width/2, winSize.height/2) ); - this->addChild(_label); - - this->runAction( Sequence::create( - DelayTime::create(3), - CallFunc::create( CC_CALLBACK_0(GameOverLayer::gameOverDone, this)), - NULL)); - - return true; - } - else - { - return false; - } -} - -void GameOverLayer::gameOverDone() -{ - Director::getInstance()->replaceScene( HelloWorld::scene() ); -} - -GameOverLayer::~GameOverLayer() -{ - if (_label) - { - _label->release(); - _label = NULL; - } -} diff --git a/samples/Cpp/SimpleGame/Classes/GameOverScene.h b/samples/Cpp/SimpleGame/Classes/GameOverScene.h deleted file mode 100644 index 1bbf1907e1..0000000000 --- a/samples/Cpp/SimpleGame/Classes/GameOverScene.h +++ /dev/null @@ -1,55 +0,0 @@ -/**************************************************************************** - Copyright (c) 2010-2011 cocos2d-x.org - Copyright (c) 2010 Ray Wenderlich - - http://www.cocos2d-x.org - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - THE SOFTWARE. - ****************************************************************************/ - -#ifndef _GAME_OVER_SCENE_H_ -#define _GAME_OVER_SCENE_H_ - -#include "cocos2d.h" - -class GameOverLayer : public cocos2d::LayerColor -{ -public: - GameOverLayer():_label(NULL) {}; - virtual ~GameOverLayer(); - bool init(); - CREATE_FUNC(GameOverLayer); - - void gameOverDone(); - - CC_SYNTHESIZE_READONLY(cocos2d::LabelTTF*, _label, Label); -}; - -class GameOverScene : public cocos2d::Scene -{ -public: - GameOverScene():_layer(NULL) {}; - ~GameOverScene(); - bool init(); - CREATE_FUNC(GameOverScene); - - CC_SYNTHESIZE_READONLY(GameOverLayer*, _layer, Layer); -}; - -#endif // _GAME_OVER_SCENE_H_ diff --git a/samples/Cpp/SimpleGame/Classes/HelloWorldScene.cpp b/samples/Cpp/SimpleGame/Classes/HelloWorldScene.cpp deleted file mode 100644 index 85d2f97be9..0000000000 --- a/samples/Cpp/SimpleGame/Classes/HelloWorldScene.cpp +++ /dev/null @@ -1,316 +0,0 @@ -#include "HelloWorldScene.h" -#include "GameOverScene.h" -#include "SimpleAudioEngine.h" - -using namespace cocos2d; - -HelloWorld::~HelloWorld() -{ - if (_targets) - { - _targets->release(); - _targets = NULL; - } - - if (_projectiles) - { - _projectiles->release(); - _projectiles = NULL; - } - - // cpp don't need to call super dealloc - // virtual destructor will do this -} - -HelloWorld::HelloWorld() -:_targets(NULL) -,_projectiles(NULL) -,_projectilesDestroyed(0) -{ -} - -Scene* HelloWorld::scene() -{ - Scene * scene = NULL; - do - { - // 'scene' is an autorelease object - scene = Scene::create(); - CC_BREAK_IF(! scene); - - // 'layer' is an autorelease object - HelloWorld *layer = HelloWorld::create(); - CC_BREAK_IF(! layer); - - // add layer as a child to scene - scene->addChild(layer); - } while (0); - - // return the scene - return scene; -} - -// on "init" you need to initialize your instance -bool HelloWorld::init() -{ - bool bRet = false; - do - { - ////////////////////////////////////////////////////////////////////////// - // super init first - ////////////////////////////////////////////////////////////////////////// - - CC_BREAK_IF(! LayerColor::initWithColor( Color4B(255,255,255,255) ) ); - - ////////////////////////////////////////////////////////////////////////// - // add your codes below... - ////////////////////////////////////////////////////////////////////////// - - // 1. Add a menu item with "X" image, which is clicked to quit the program. - - // Create a "close" menu item with close icon, it's an auto release object. - auto closeItem = MenuItemImage::create( - "CloseNormal.png", - "CloseSelected.png", - CC_CALLBACK_1(HelloWorld::menuCloseCallback,this)); - CC_BREAK_IF(! closeItem); - - // Place the menu item bottom-right conner. - auto visibleSize = Director::getInstance()->getVisibleSize(); - auto origin = Director::getInstance()->getVisibleOrigin(); - - closeItem->setPosition(Point(origin.x + visibleSize.width - closeItem->getContentSize().width/2, - origin.y + closeItem->getContentSize().height/2)); - - // Create a menu with the "close" menu item, it's an auto release object. - auto menu = Menu::create(closeItem, NULL); - menu->setPosition(Point::ZERO); - CC_BREAK_IF(! menu); - - // Add the menu to HelloWorld layer as a child layer. - this->addChild(menu, 1); - - ///////////////////////////// - // 2. add your codes below... - auto player = Sprite::create("Player.png", Rect(0, 0, 27, 40) ); - - player->setPosition( Point(origin.x + player->getContentSize().width/2, - origin.y + visibleSize.height/2) ); - this->addChild(player); - - this->schedule( schedule_selector(HelloWorld::gameLogic), 1.0 ); - - auto dispatcher = Director::getInstance()->getEventDispatcher(); - auto listener = EventListenerTouchAllAtOnce::create(); - listener->onTouchesEnded = CC_CALLBACK_2(HelloWorld::onTouchesEnded, this); - dispatcher->addEventListenerWithSceneGraphPriority(listener, this); - - _targets = new Array(); - _targets->init(); - - _projectiles = new Array(); - _projectiles->init(); - - // use updateGame instead of update, otherwise it will conflit with SelectorProtocol::update - // see http://www.cocos2d-x.org/boards/6/topics/1478 - this->schedule( schedule_selector(HelloWorld::updateGame) ); - - CocosDenshion::SimpleAudioEngine::getInstance()->playBackgroundMusic("background-music-aac.wav", true); - - bRet = true; - } while (0); - - return bRet; -} - -void HelloWorld::menuCloseCallback(Object* sender) -{ - // "close" menu item clicked - Director::getInstance()->end(); -} - -// cpp with cocos2d-x -void HelloWorld::addTarget() -{ - Sprite *target = Sprite::create("Target.png", Rect(0,0,27,40) ); - - // Determine where to spawn the target along the Y axis - Size winSize = Director::getInstance()->getVisibleSize(); - float minY = target->getContentSize().height/2; - float maxY = winSize.height - target->getContentSize().height/2; - int rangeY = (int)(maxY - minY); - // srand( TimGetTicks() ); - int actualY = ( rand() % rangeY ) + (int)minY; - - // Create the target slightly off-screen along the right edge, - // and along a random position along the Y axis as calculated - target->setPosition( - Point(winSize.width + (target->getContentSize().width/2), - Director::getInstance()->getVisibleOrigin().y + actualY) ); - this->addChild(target); - - // Determine speed of the target - int minDuration = (int)2.0; - int maxDuration = (int)4.0; - int rangeDuration = maxDuration - minDuration; - // srand( TimGetTicks() ); - int actualDuration = ( rand() % rangeDuration ) + minDuration; - - // Create the actions - FiniteTimeAction* actionMove = MoveTo::create( (float)actualDuration, - Point(0 - target->getContentSize().width/2, actualY) ); - FiniteTimeAction* actionMoveDone = CallFuncN::create( CC_CALLBACK_1(HelloWorld::spriteMoveFinished, this)); - target->runAction( Sequence::create(actionMove, actionMoveDone, NULL) ); - - // Add to targets array - target->setTag(1); - _targets->addObject(target); -} - -void HelloWorld::spriteMoveFinished(Node* sender) -{ - Sprite *sprite = (Sprite *)sender; - this->removeChild(sprite, true); - - if (sprite->getTag() == 1) // target - { - _targets->removeObject(sprite); - - auto gameOverScene = GameOverScene::create(); - gameOverScene->getLayer()->getLabel()->setString("You Lose :["); - Director::getInstance()->replaceScene(gameOverScene); - - } - else if (sprite->getTag() == 2) // projectile - { - _projectiles->removeObject(sprite); - } -} - -void HelloWorld::gameLogic(float dt) -{ - this->addTarget(); -} - -// cpp with cocos2d-x -void HelloWorld::onTouchesEnded(const std::vector& touches, Event* event) -{ - // Choose one of the touches to work with - Touch* touch = touches[0]; - Point location = touch->getLocation(); - - log("++++++++after x:%f, y:%f", location.x, location.y); - - // Set up initial location of projectile - Size winSize = Director::getInstance()->getVisibleSize(); - auto origin = Director::getInstance()->getVisibleOrigin(); - Sprite *projectile = Sprite::create("Projectile.png", Rect(0, 0, 20, 20)); - projectile->setPosition( Point(origin.x+20, origin.y+winSize.height/2) ); - - // Determinie offset of location to projectile - float offX = location.x - projectile->getPosition().x; - float offY = location.y - projectile->getPosition().y; - - // Bail out if we are shooting down or backwards - if (offX <= 0) return; - - // Ok to add now - we've double checked position - this->addChild(projectile); - - // Determine where we wish to shoot the projectile to - float realX = origin.x+winSize.width + (projectile->getContentSize().width/2); - float ratio = offY / offX; - float realY = (realX * ratio) + projectile->getPosition().y; - Point realDest = Point(realX, realY); - - // Determine the length of how far we're shooting - float offRealX = realX - projectile->getPosition().x; - float offRealY = realY - projectile->getPosition().y; - float length = sqrtf((offRealX * offRealX) + (offRealY*offRealY)); - float velocity = 480/1; // 480pixels/1sec - float realMoveDuration = length/velocity; - - // Move projectile to actual endpoint - projectile->runAction( Sequence::create( - MoveTo::create(realMoveDuration, realDest), - CallFuncN::create(CC_CALLBACK_1(HelloWorld::spriteMoveFinished, this)), - NULL) ); - - // Add to projectiles array - projectile->setTag(2); - _projectiles->addObject(projectile); - - CocosDenshion::SimpleAudioEngine::getInstance()->playEffect("pew-pew-lei.wav"); -} - -void HelloWorld::updateGame(float dt) -{ - Array *projectilesToDelete = new Array(); - projectilesToDelete->init(); - - Object* it = NULL; - Object* jt = NULL; - - // for (it = _projectiles->begin(); it != _projectiles->end(); it++) - CCARRAY_FOREACH(_projectiles, it) - { - auto projectile = dynamic_cast(it); - auto projectileRect = Rect( - projectile->getPosition().x - (projectile->getContentSize().width/2), - projectile->getPosition().y - (projectile->getContentSize().height/2), - projectile->getContentSize().width, - projectile->getContentSize().height); - - auto targetsToDelete = new Array(); - targetsToDelete->init(); - - // for (jt = _targets->begin(); jt != _targets->end(); jt++) - CCARRAY_FOREACH(_targets, jt) - { - auto target = dynamic_cast(jt); - auto targetRect = Rect( - target->getPosition().x - (target->getContentSize().width/2), - target->getPosition().y - (target->getContentSize().height/2), - target->getContentSize().width, - target->getContentSize().height); - - // if (Rect::RectIntersectsRect(projectileRect, targetRect)) - if (projectileRect.intersectsRect(targetRect)) - { - targetsToDelete->addObject(target); - } - } - - // for (jt = targetsToDelete->begin(); jt != targetsToDelete->end(); jt++) - CCARRAY_FOREACH(targetsToDelete, jt) - { - auto target = dynamic_cast(jt); - _targets->removeObject(target); - this->removeChild(target, true); - - _projectilesDestroyed++; - if (_projectilesDestroyed >= 5) - { - auto gameOverScene = GameOverScene::create(); - gameOverScene->getLayer()->getLabel()->setString("You Win!"); - Director::getInstance()->replaceScene(gameOverScene); - } - } - - if (targetsToDelete->count() > 0) - { - projectilesToDelete->addObject(projectile); - } - targetsToDelete->release(); - } - - // for (it = projectilesToDelete->begin(); it != projectilesToDelete->end(); it++) - CCARRAY_FOREACH(projectilesToDelete, it) - { - auto projectile = dynamic_cast(it); - _projectiles->removeObject(projectile); - this->removeChild(projectile, true); - } - projectilesToDelete->release(); -} - diff --git a/samples/Cpp/SimpleGame/Classes/HelloWorldScene.h b/samples/Cpp/SimpleGame/Classes/HelloWorldScene.h deleted file mode 100644 index ee65eb2f08..0000000000 --- a/samples/Cpp/SimpleGame/Classes/HelloWorldScene.h +++ /dev/null @@ -1,46 +0,0 @@ -#ifndef __HELLOWORLD_SCENE_H__ -#define __HELLOWORLD_SCENE_H__ - -#include "cocos2d.h" - -//#include "SimpleAudioEngine.h" - -class HelloWorld : public cocos2d::LayerColor -{ -public: - HelloWorld(); - ~HelloWorld(); - - // Here's a difference. Method 'init' in cocos2d-x returns bool, - // instead of returning 'id' in cocos2d-iphone - virtual bool init(); - - // there's no 'id' in cpp, so we recommand to return the exactly class pointer - static cocos2d::Scene* scene(); - - // a selector callback - virtual void menuCloseCallback(cocos2d::Object* sender); - - // implement the "static node()" method manually - CREATE_FUNC(HelloWorld); - - void spriteMoveFinished(cocos2d::Node* sender); - - void gameLogic(float dt); - - void updateGame(float dt); - - void onTouchesEnded(const std::vector& touches, cocos2d::Event* event); - - -protected: - cocos2d::Array *_targets; - cocos2d::Array *_projectiles; - int _projectilesDestroyed; - - void addTarget(); - - -}; - -#endif // __HELLOWORLD_SCENE_H__ diff --git a/samples/Cpp/SimpleGame/Resources/.gitignore b/samples/Cpp/SimpleGame/Resources/.gitignore deleted file mode 100644 index 1d65afe366..0000000000 --- a/samples/Cpp/SimpleGame/Resources/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -#Do now ignore Marmalade icf files -!*.icf diff --git a/samples/Cpp/SimpleGame/Resources/app.config.txt b/samples/Cpp/SimpleGame/Resources/app.config.txt deleted file mode 100644 index b39bf0b1db..0000000000 --- a/samples/Cpp/SimpleGame/Resources/app.config.txt +++ /dev/null @@ -1,10 +0,0 @@ -# This .config.txt file documents configuration settings for your -# application -# The syntax is similar to that in .icf files: -# -# [GroupName] -# Setting Documentation for setting -# -# e.g. -# [MyApplicationGroup] -# MySetting Description of what MySetting is for, its default values, etc diff --git a/samples/Cpp/SimpleGame/proj.android/.classpath b/samples/Cpp/SimpleGame/proj.android/.classpath deleted file mode 100644 index c06dfcb8e5..0000000000 --- a/samples/Cpp/SimpleGame/proj.android/.classpath +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/samples/Cpp/SimpleGame/proj.android/.project b/samples/Cpp/SimpleGame/proj.android/.project deleted file mode 100644 index bf3f3d0350..0000000000 --- a/samples/Cpp/SimpleGame/proj.android/.project +++ /dev/null @@ -1,65 +0,0 @@ - - - SimpleGame - - - - - - com.android.ide.eclipse.adt.ResourceManagerBuilder - - - - - com.android.ide.eclipse.adt.PreCompilerBuilder - - - - - org.eclipse.jdt.core.javabuilder - - - - - com.android.ide.eclipse.adt.ApkBuilder - - - - - org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder - full,incremental, - - - - - - com.android.ide.eclipse.adt.AndroidNature - org.eclipse.jdt.core.javanature - org.eclipse.cdt.core.cnature - org.eclipse.cdt.core.ccnature - org.eclipse.cdt.managedbuilder.core.managedBuildNature - org.eclipse.cdt.managedbuilder.core.ScannerConfigNature - - - - Classes - 2 - COCOS2DX/samples/Cpp/SimpleGame/Classes - - - cocos2dx - 2 - COCOS2DX/cocos2dx - - - cocosdenshion - 2 - COCOS2DX/CocosDenshion - - - extensions - 2 - COCOS2DX/extensions - - - diff --git a/samples/Cpp/SimpleGame/proj.android/.settings/org.eclipse.cdt.codan.core.prefs b/samples/Cpp/SimpleGame/proj.android/.settings/org.eclipse.cdt.codan.core.prefs deleted file mode 100644 index bad4196993..0000000000 --- a/samples/Cpp/SimpleGame/proj.android/.settings/org.eclipse.cdt.codan.core.prefs +++ /dev/null @@ -1,68 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.cdt.codan.checkers.errnoreturn=-Warning -org.eclipse.cdt.codan.checkers.errnoreturn.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},implicit\=>false} -org.eclipse.cdt.codan.checkers.errreturnvalue=-Error -org.eclipse.cdt.codan.checkers.errreturnvalue.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.checkers.noreturn=-Error -org.eclipse.cdt.codan.checkers.noreturn.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},implicit\=>false} -org.eclipse.cdt.codan.internal.checkers.AbstractClassCreation=-Error -org.eclipse.cdt.codan.internal.checkers.AbstractClassCreation.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.AmbiguousProblem=-Error -org.eclipse.cdt.codan.internal.checkers.AmbiguousProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.AssignmentInConditionProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.AssignmentInConditionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.AssignmentToItselfProblem=-Error -org.eclipse.cdt.codan.internal.checkers.AssignmentToItselfProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.CaseBreakProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.CaseBreakProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},no_break_comment\=>"no break",last_case_param\=>true,empty_case_param\=>false} -org.eclipse.cdt.codan.internal.checkers.CatchByReference=-Warning -org.eclipse.cdt.codan.internal.checkers.CatchByReference.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},unknown\=>false,exceptions\=>()} -org.eclipse.cdt.codan.internal.checkers.CircularReferenceProblem=-Error -org.eclipse.cdt.codan.internal.checkers.CircularReferenceProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.ClassMembersInitialization=-Warning -org.eclipse.cdt.codan.internal.checkers.ClassMembersInitialization.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},skip\=>true} -org.eclipse.cdt.codan.internal.checkers.FieldResolutionProblem=-Error -org.eclipse.cdt.codan.internal.checkers.FieldResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.FunctionResolutionProblem=-Error -org.eclipse.cdt.codan.internal.checkers.FunctionResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.InvalidArguments=-Error -org.eclipse.cdt.codan.internal.checkers.InvalidArguments.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.InvalidTemplateArgumentsProblem=-Error -org.eclipse.cdt.codan.internal.checkers.InvalidTemplateArgumentsProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.LabelStatementNotFoundProblem=-Error -org.eclipse.cdt.codan.internal.checkers.LabelStatementNotFoundProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.MemberDeclarationNotFoundProblem=-Error -org.eclipse.cdt.codan.internal.checkers.MemberDeclarationNotFoundProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.MethodResolutionProblem=-Error -org.eclipse.cdt.codan.internal.checkers.MethodResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.NamingConventionFunctionChecker=-Info -org.eclipse.cdt.codan.internal.checkers.NamingConventionFunctionChecker.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},pattern\=>"^[a-z]",macro\=>true,exceptions\=>()} -org.eclipse.cdt.codan.internal.checkers.NonVirtualDestructorProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.NonVirtualDestructorProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.OverloadProblem=-Error -org.eclipse.cdt.codan.internal.checkers.OverloadProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.RedeclarationProblem=-Error -org.eclipse.cdt.codan.internal.checkers.RedeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.RedefinitionProblem=-Error -org.eclipse.cdt.codan.internal.checkers.RedefinitionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.ReturnStyleProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.ReturnStyleProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.ScanfFormatStringSecurityProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.ScanfFormatStringSecurityProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.StatementHasNoEffectProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.StatementHasNoEffectProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true,exceptions\=>()} -org.eclipse.cdt.codan.internal.checkers.SuggestedParenthesisProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.SuggestedParenthesisProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},paramNot\=>false} -org.eclipse.cdt.codan.internal.checkers.SuspiciousSemicolonProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.SuspiciousSemicolonProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},else\=>false,afterelse\=>false} -org.eclipse.cdt.codan.internal.checkers.TypeResolutionProblem=-Error -org.eclipse.cdt.codan.internal.checkers.TypeResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.UnusedFunctionDeclarationProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.UnusedFunctionDeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true} -org.eclipse.cdt.codan.internal.checkers.UnusedStaticFunctionProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.UnusedStaticFunctionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true} -org.eclipse.cdt.codan.internal.checkers.UnusedVariableDeclarationProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.UnusedVariableDeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true,exceptions\=>("@(\#)","$Id")} -org.eclipse.cdt.codan.internal.checkers.VariableResolutionProblem=-Error -org.eclipse.cdt.codan.internal.checkers.VariableResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -useParentScope=false diff --git a/samples/Cpp/SimpleGame/proj.android/AndroidManifest.xml b/samples/Cpp/SimpleGame/proj.android/AndroidManifest.xml deleted file mode 100644 index a0a36be837..0000000000 --- a/samples/Cpp/SimpleGame/proj.android/AndroidManifest.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/samples/Cpp/SimpleGame/proj.android/README.md b/samples/Cpp/SimpleGame/proj.android/README.md deleted file mode 100644 index 312835611a..0000000000 --- a/samples/Cpp/SimpleGame/proj.android/README.md +++ /dev/null @@ -1,87 +0,0 @@ -## Prerequisites: - -* Android NDK -* Android SDK **OR** Eclipse ADT Bundle -* Android AVD target installed - -## Building project - -There are two ways of building Android projects. - -1. Eclipse -2. Command Line - -### Import Project in Eclipse - -#### Features: - -1. Complete workflow from Eclipse, including: - * Build C++. - * Clean C++. - * Build and Run whole project. - * Logcat view. - * Debug Java code. - * Javascript editor. - * Project management. -2. True C++ editing, including: - * Code completion. - * Jump to definition. - * Refactoring tools etc. - * Quick open C++ files. - - -#### Setup Eclipse Environment (only once) - - -**NOTE:** This step needs to be done only once to setup the Eclipse environment for cocos2d-x projects. Skip this section if you've done this before. - -1. Download Eclipse ADT bundle from [Google ADT homepage](http://developer.android.com/sdk/index.html) - - **OR** - - Install Eclipse with Java. Add ADT and CDT plugins. - -2. Only for Windows - 1. Install [Cygwin](http://www.cygwin.com/) with make (select make package from the list during the install). - 2. Add `Cygwin\bin` directory to system PATH variable. - 3. Add this line `none /cygdrive cygdrive binary,noacl,posix=0,user 0 0` to `Cygwin\etc\fstab` file. - -3. Set up Variables: - 1. Path Variable `COCOS2DX`: - * Eclipse->Preferences->General->Workspace->**Linked Resources** - * Click **New** button to add a Path Variable `COCOS2DX` pointing to the root cocos2d-x directory. - ![Example](https://lh5.googleusercontent.com/-oPpk9kg3e5w/UUOYlq8n7aI/AAAAAAAAsdQ/zLA4eghBH9U/s400/cocos2d-x-eclipse-vars.png) - - 2. C/C++ Environment Variable `NDK_ROOT`: - * Eclipse->Preferences->C/C++->Build->**Environment**. - * Click **Add** button and add a new variable `NDK_ROOT` pointing to the root NDK directory. - ![Example](https://lh3.googleusercontent.com/-AVcY8IAT0_g/UUOYltoRobI/AAAAAAAAsdM/22D2J9u3sig/s400/cocos2d-x-eclipse-ndk.png) - * Only for Windows: Add new variables **CYGWIN** with value `nodosfilewarning` and **SHELLOPTS** with value `igncr` - -4. Import libcocos2dx library project: - 1. File->New->Project->Android Project From Existing Code. - 2. Click **Browse** button and open `cocos2d-x/cocos2dx/platform/android/java` directory. - 3. Click **Finish** to add project. - -#### Adding and running from Eclipse - -![Example](https://lh3.googleusercontent.com/-SLBOu6e3QbE/UUOcOXYaGqI/AAAAAAAAsdo/tYBY2SylOSM/s288/cocos2d-x-eclipse-project-from-code.png) ![Import](https://lh5.googleusercontent.com/-XzC9Pn65USc/UUOcOTAwizI/AAAAAAAAsdk/4b6YM-oim9Y/s400/cocos2d-x-eclipse-import-project.png) - -1. File->New->Project->Android Project From Existing Code -2. **Browse** to your project directory. eg: `cocos2d-x/cocos2dx/samples/Cpp/TestCpp/proj.android/` -3. Add the project -4. Click **Run** or **Debug** to compile C++ followed by Java and to run on connected device or emulator. - - -### Running project from Command Line - - $ cd cocos2d-x/samples/Cpp/TestCpp/proj.android/ - $ export NDK_ROOT=/path/to/ndk - $ ./build_native.sh - $ ant debug install - -If the last command results in sdk.dir missing error then do: - - $ android list target - $ android update project -p . -t (id from step 6) - $ android update project -p cocos2d-x/cocos2dx/platform/android/java/ -t (id from step 6) diff --git a/samples/Cpp/SimpleGame/proj.android/build.xml b/samples/Cpp/SimpleGame/proj.android/build.xml deleted file mode 100644 index e9678a9b14..0000000000 --- a/samples/Cpp/SimpleGame/proj.android/build.xml +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/samples/Cpp/SimpleGame/proj.android/jni/Android.mk b/samples/Cpp/SimpleGame/proj.android/jni/Android.mk deleted file mode 100644 index cdc6ac3234..0000000000 --- a/samples/Cpp/SimpleGame/proj.android/jni/Android.mk +++ /dev/null @@ -1,21 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE := game_shared - -LOCAL_MODULE_FILENAME := libgame - -LOCAL_SRC_FILES := hellocpp/main.cpp \ - ../../Classes/AppDelegate.cpp \ - ../../Classes/HelloWorldScene.cpp \ - ../../Classes/GameOverScene.cpp - -LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../Classes - -LOCAL_WHOLE_STATIC_LIBRARIES := cocos2dx_static cocosdenshion_static - -include $(BUILD_SHARED_LIBRARY) - -$(call import-module,audio/android) -$(call import-module,2d) diff --git a/samples/Cpp/SimpleGame/proj.android/jni/Application.mk b/samples/Cpp/SimpleGame/proj.android/jni/Application.mk deleted file mode 100644 index 74af9626ab..0000000000 --- a/samples/Cpp/SimpleGame/proj.android/jni/Application.mk +++ /dev/null @@ -1,5 +0,0 @@ -APP_STL := gnustl_static - -# add -Wno-literal-suffix to avoid warning: warning: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wliteral-suffix] -# in NDK_ROOT/arch-arm/usr/include/sys/cdefs_elf.h:35:28: when using ndk-r9 -APP_CPPFLAGS := -frtti -DCOCOS2D_DEBUG=1 -std=c++11 -Wno-literal-suffix -fsigned-char diff --git a/samples/Cpp/SimpleGame/proj.android/jni/hellocpp/main.cpp b/samples/Cpp/SimpleGame/proj.android/jni/hellocpp/main.cpp deleted file mode 100644 index ab92fe0f5a..0000000000 --- a/samples/Cpp/SimpleGame/proj.android/jni/hellocpp/main.cpp +++ /dev/null @@ -1,16 +0,0 @@ -#include "AppDelegate.h" -#include "platform/android/jni/JniHelper.h" -#include -#include - -#include "HelloWorldScene.h" - -#define LOG_TAG "main" -#define LOGD(...) __android_log_print(ANDROID_LOG_DEBUG,LOG_TAG,__VA_ARGS__) - -using namespace cocos2d; - -void cocos_android_app_init (struct android_app* app) { - LOGD("cocos_android_app_init"); - AppDelegate *pAppDelegate = new AppDelegate(); -} diff --git a/samples/Cpp/SimpleGame/proj.android/jni/list.sh b/samples/Cpp/SimpleGame/proj.android/jni/list.sh deleted file mode 100755 index b29f678cb8..0000000000 --- a/samples/Cpp/SimpleGame/proj.android/jni/list.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash - -append_str=' \' - -list_alldir() -{ - for file in $1/* - do - if [ -f $file ]; then - echo $file$append_str | grep .cpp - fi - - if [ -d $file ]; then - list_alldir $file - fi - done -} - -if [ $# -gt 0 ]; then - list_alldir "$1" -else - list_alldir "." -fi diff --git a/samples/Cpp/SimpleGame/proj.android/ndkgdb.sh b/samples/Cpp/SimpleGame/proj.android/ndkgdb.sh deleted file mode 100755 index ed934f9bfb..0000000000 --- a/samples/Cpp/SimpleGame/proj.android/ndkgdb.sh +++ /dev/null @@ -1,62 +0,0 @@ -APPNAME="SimpleGame" -APP_ANDROID_NAME="org.cocos2dx.simplegame" - -# read local.properties - -_LOCALPROPERTIES_FILE=$(dirname "$0")"/local.properties" -if [ -f "$_LOCALPROPERTIES_FILE" ] -then - [ -r "$_LOCALPROPERTIES_FILE" ] || die "Fatal Error: $_LOCALPROPERTIES_FILE exists but is unreadable" - - # strip out entries with a "." because Bash cannot process variables with a "." - _PROPERTIES=$(sed '/\./d' "$_LOCALPROPERTIES_FILE") - for line in $_PROPERTIES - do - declare "$line" - done -fi - -if [ -z "${SDK_ROOT+aaa}" ]; then -echo "SDK_ROOT not defined. Please define SDK_ROOT in your environment or in local.properties" -exit 1 -fi - -if [ -z "${NDK_ROOT+aaa}" ]; then -echo "NDK_ROOT not defined. Please define NDK_ROOT in your environment or in local.properties" -exit 1 -fi - -if [ -z "${COCOS2DX_ROOT+aaa}" ]; then -# ... if COCOS2DX_ROOT is not set -# ... find current working directory - DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -# ... use paths relative to current directory - COCOS2DX_ROOT="$DIR/../../../.." - APP_ROOT="$DIR/.." - APP_ANDROID_ROOT="$DIR" -else - APP_ROOT="$COCOS2DX_ROOT/samples/$APPNAME" - APP_ANDROID_ROOT="$COCOS2DX_ROOT/samples/$APPNAME/proj.android" -fi - -echo "NDK_ROOT = $NDK_ROOT" -echo "SDK_ROOT = $SDK_ROOT" -echo "COCOS2DX_ROOT = $COCOS2DX_ROOT" -echo "APP_ROOT = $APP_ROOT" -echo "APP_ANDROID_ROOT = $APP_ANDROID_ROOT" -echo "APP_ANDROID_NAME = $APP_ANDROID_NAME" - -echo -echo "Killing and restarting ${APP_ANDROID_NAME}" -echo - -set -x - -"${SDK_ROOT}"/platform-tools/adb shell am force-stop "${APP_ANDROID_NAME}" - -NDK_MODULE_PATH="${COCOS2DX_ROOT}":"${COCOS2DX_ROOT}"/cocos2dx/platform/third_party/android/prebuilt \ - "${NDK_ROOT}"/ndk-gdb \ - --adb="${SDK_ROOT}"/platform-tools/adb \ - --verbose \ - --start \ - --force diff --git a/samples/Cpp/SimpleGame/proj.android/project.properties b/samples/Cpp/SimpleGame/proj.android/project.properties deleted file mode 100644 index f7e62936d0..0000000000 --- a/samples/Cpp/SimpleGame/proj.android/project.properties +++ /dev/null @@ -1,15 +0,0 @@ -# This file is automatically generated by Android Tools. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file must be checked in Version Control Systems. -# -# To customize properties used by the Ant build system edit -# "ant.properties", and override values to adapt the script to your -# project structure. -# -# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home): -#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt - -# Project target. -target=android-10 -android.library.reference.1=../../../../cocos/2d/platform/android/java diff --git a/samples/Cpp/SimpleGame/proj.android/res/values/strings.xml b/samples/Cpp/SimpleGame/proj.android/res/values/strings.xml deleted file mode 100644 index f197c895b7..0000000000 --- a/samples/Cpp/SimpleGame/proj.android/res/values/strings.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - SimpleGame - diff --git a/samples/Cpp/SimpleGame/proj.android/run.sh b/samples/Cpp/SimpleGame/proj.android/run.sh deleted file mode 100755 index 6f21bffa98..0000000000 --- a/samples/Cpp/SimpleGame/proj.android/run.sh +++ /dev/null @@ -1 +0,0 @@ -~/bin/android-sdk/platform-tools/adb shell am start org.cocos2dx.simplegame/android.app.NativeActivity diff --git a/samples/Cpp/SimpleGame/proj.android/src/org/cocos2dx/simplegame/Cocos2dxActivity.java b/samples/Cpp/SimpleGame/proj.android/src/org/cocos2dx/simplegame/Cocos2dxActivity.java deleted file mode 100644 index 09065bdd15..0000000000 --- a/samples/Cpp/SimpleGame/proj.android/src/org/cocos2dx/simplegame/Cocos2dxActivity.java +++ /dev/null @@ -1,33 +0,0 @@ -package org.cocos2dx.simplegame; - -import android.app.NativeActivity; -import android.graphics.PixelFormat; -import android.os.Bundle; - -public class Cocos2dxActivity extends NativeActivity { - - @Override - protected void onCreate(Bundle savedInstanceState) { - // TODO Auto-generated method stub - super.onCreate(savedInstanceState); - - //For supports translucency - - //1.change "attribs" in cocos\2d\platform\android\nativeactivity.cpp - /*const EGLint attribs[] = { - EGL_SURFACE_TYPE, EGL_WINDOW_BIT, - EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT, - //EGL_BLUE_SIZE, 5, -->delete - //EGL_GREEN_SIZE, 6, -->delete - //EGL_RED_SIZE, 5, -->delete - EGL_BUFFER_SIZE, 32, //-->new field - EGL_DEPTH_SIZE, 16, - EGL_STENCIL_SIZE, 8, - EGL_NONE - };*/ - - //2.Set the format of window - // getWindow().setFormat(PixelFormat.TRANSLUCENT); - - } -} diff --git a/samples/Cpp/SimpleGame/proj.ios/AppController.h b/samples/Cpp/SimpleGame/proj.ios/AppController.h deleted file mode 100644 index 3d51064ca0..0000000000 --- a/samples/Cpp/SimpleGame/proj.ios/AppController.h +++ /dev/null @@ -1,33 +0,0 @@ -/**************************************************************************** - Copyright (c) 2010 cocos2d-x.org - - http://www.cocos2d-x.org - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - THE SOFTWARE. - ****************************************************************************/ - -@class RootViewController; - -@interface AppController : NSObject { - UIWindow *window; - RootViewController *viewController; -} - -@end - diff --git a/samples/Cpp/SimpleGame/proj.ios/AppController.mm b/samples/Cpp/SimpleGame/proj.ios/AppController.mm deleted file mode 100644 index 5e2010ba4c..0000000000 --- a/samples/Cpp/SimpleGame/proj.ios/AppController.mm +++ /dev/null @@ -1,134 +0,0 @@ -/**************************************************************************** - Copyright (c) 2010 cocos2d-x.org - - http://www.cocos2d-x.org - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - THE SOFTWARE. - ****************************************************************************/ -#import -#import "AppController.h" -#import "cocos2d.h" -#import "EAGLView.h" -#import "AppDelegate.h" - -#import "RootViewController.h" - -@implementation AppController - -#pragma mark - -#pragma mark Application lifecycle - -// cocos2d application instance -static AppDelegate s_sharedApplication; - -- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { - - // Override point for customization after application launch. - - // Add the view controller's view to the window and display. - window = [[UIWindow alloc] initWithFrame: [[UIScreen mainScreen] bounds]]; - CCEAGLView *__glView = [CCEAGLView viewWithFrame: [window bounds] - pixelFormat: kEAGLColorFormatRGBA8 - depthFormat: GL_DEPTH_COMPONENT16 - preserveBackbuffer: NO - sharegroup:nil - multiSampling:NO - numberOfSamples:0]; - - // Use RootViewController manage CCEAGLView - viewController = [[RootViewController alloc] initWithNibName:nil bundle:nil]; - viewController.wantsFullScreenLayout = YES; - viewController.view = __glView; - - // Set RootViewController to window - if ( [[UIDevice currentDevice].systemVersion floatValue] < 6.0) - { - // warning: addSubView doesn't work on iOS6 - [window addSubview: viewController.view]; - } - else - { - // use this method on ios6 - [window setRootViewController:viewController]; - } - - [window makeKeyAndVisible]; - - [[UIApplication sharedApplication] setStatusBarHidden: YES]; - - cocos2d::Application::getInstance()->run(); - return YES; -} - - -- (void)applicationWillResignActive:(UIApplication *)application { - /* - Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state. - Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game. - */ - cocos2d::Director::getInstance()->pause(); -} - -- (void)applicationDidBecomeActive:(UIApplication *)application { - /* - Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface. - */ - cocos2d::Director::getInstance()->resume(); -} - -- (void)applicationDidEnterBackground:(UIApplication *)application { - /* - Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later. - If your application supports background execution, called instead of applicationWillTerminate: when the user quits. - */ - cocos2d::Application::getInstance()->applicationDidEnterBackground(); -} - -- (void)applicationWillEnterForeground:(UIApplication *)application { - /* - Called as part of transition from the background to the inactive state: here you can undo many of the changes made on entering the background. - */ - cocos2d::Application::getInstance()->applicationWillEnterForeground(); -} - -- (void)applicationWillTerminate:(UIApplication *)application { - /* - Called when the application is about to terminate. - See also applicationDidEnterBackground:. - */ -} - - -#pragma mark - -#pragma mark Memory management - -- (void)applicationDidReceiveMemoryWarning:(UIApplication *)application { - /* - Free up as much memory as possible by purging cached data objects that can be recreated (or reloaded from disk) later. - */ -} - - -- (void)dealloc { - [super dealloc]; -} - - -@end - diff --git a/samples/Cpp/SimpleGame/proj.ios/SimpleGame_Prefix.pch b/samples/Cpp/SimpleGame/proj.ios/SimpleGame_Prefix.pch deleted file mode 100644 index b8914281d2..0000000000 --- a/samples/Cpp/SimpleGame/proj.ios/SimpleGame_Prefix.pch +++ /dev/null @@ -1,8 +0,0 @@ -// -// Prefix header for all source files of the 'HelloWorld' target in the 'HelloWorld' project -// - -#ifdef __OBJC__ - #import - #import -#endif diff --git a/samples/Cpp/SimpleGame/proj.ios/main.m b/samples/Cpp/SimpleGame/proj.ios/main.m deleted file mode 100644 index bd577a036e..0000000000 --- a/samples/Cpp/SimpleGame/proj.ios/main.m +++ /dev/null @@ -1,17 +0,0 @@ -// -// main.m -// iphone -// -// Created by Walzer on 10-11-16. -// Copyright 2010 __MyCompanyName__. All rights reserved. -// - -#import - -int main(int argc, char *argv[]) { - - NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init]; - int retVal = UIApplicationMain(argc, argv, nil, @"AppController"); - [pool release]; - return retVal; -} diff --git a/samples/Cpp/SimpleGame/proj.linux/main.cpp b/samples/Cpp/SimpleGame/proj.linux/main.cpp deleted file mode 100644 index 33e1052ebd..0000000000 --- a/samples/Cpp/SimpleGame/proj.linux/main.cpp +++ /dev/null @@ -1,18 +0,0 @@ -#include "../Classes/AppDelegate.h" -#include "cocos2d.h" - -#include -#include -#include -#include - -USING_NS_CC; - -int main(int argc, char **argv) -{ - // create the application instance - AppDelegate app; - EGLView eglView; - eglView.init("SimpleGame",900,640); - return Application::getInstance()->run(); -} diff --git a/samples/Cpp/SimpleGame/proj.mac/SampleGame_Prefix.pch b/samples/Cpp/SimpleGame/proj.mac/SampleGame_Prefix.pch deleted file mode 100644 index 46c36a7e99..0000000000 --- a/samples/Cpp/SimpleGame/proj.mac/SampleGame_Prefix.pch +++ /dev/null @@ -1,7 +0,0 @@ -// -// Prefix header for all source files of the 'Paralaxer' target in the 'Paralaxer' project -// - -#ifdef __OBJC__ - #import -#endif diff --git a/samples/Cpp/SimpleGame/proj.mac/en.lproj/MainMenu.xib b/samples/Cpp/SimpleGame/proj.mac/en.lproj/MainMenu.xib deleted file mode 100644 index 07f04dbab1..0000000000 --- a/samples/Cpp/SimpleGame/proj.mac/en.lproj/MainMenu.xib +++ /dev/null @@ -1,812 +0,0 @@ - - - - 1080 - 12D78 - 3084 - 1187.37 - 626.00 - - com.apple.InterfaceBuilder.CocoaPlugin - 3084 - - - YES - NSCustomObject - NSMenu - NSMenuItem - - - YES - com.apple.InterfaceBuilder.CocoaPlugin - - - PluginDependencyRecalculationVersion - - - - YES - - NSApplication - - - FirstResponder - - - NSApplication - - - AMainMenu - - YES - - - SampleGame - - 1048576 - 2147483647 - - NSImage - NSMenuCheckmark - - - NSImage - NSMenuMixedState - - submenuAction: - - SampleGame - - YES - - - About SampleGame - - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Preferences… - , - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Services - - 1048576 - 2147483647 - - - submenuAction: - - Services - - YES - - _NSServicesMenu - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Hide HelloCpp - h - 1048576 - 2147483647 - - - - - - Hide Others - h - 1572864 - 2147483647 - - - - - - Show All - - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Quit HelloCpp - q - 1048576 - 2147483647 - - - - - _NSAppleMenu - - - - - View - - 1048576 - 2147483647 - - - submenuAction: - - View - - YES - - - Toggle Fullscreen - f - 1048576 - 2147483647 - - - - - - - - - Window - - 1048576 - 2147483647 - - - submenuAction: - - Window - - YES - - - Minimize - m - 1048576 - 2147483647 - - - - - - Zoom - - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Bring All to Front - - 1048576 - 2147483647 - - - - - _NSWindowsMenu - - - - - Help - - 2147483647 - - - submenuAction: - - Help - - YES - - - SampleGame Help - ? - 1048576 - 2147483647 - - - - - _NSHelpMenu - - - - _NSMainMenu - - - AppController - - - NSFontManager - - - - - YES - - - terminate: - - - - 449 - - - - orderFrontStandardAboutPanel: - - - - 142 - - - - delegate - - - - 495 - - - - performMiniaturize: - - - - 37 - - - - arrangeInFront: - - - - 39 - - - - performZoom: - - - - 240 - - - - hide: - - - - 367 - - - - hideOtherApplications: - - - - 368 - - - - unhideAllApplications: - - - - 370 - - - - showHelp: - - - - 493 - - - - toggleFullScreen: - - - - 537 - - - - - YES - - 0 - - YES - - - - - - -2 - - - File's Owner - - - -1 - - - First Responder - - - -3 - - - Application - - - 29 - - - YES - - - - - - - - - 19 - - - YES - - - - - - 56 - - - YES - - - - - - 57 - - - YES - - - - - - - - - - - - - - - - 58 - - - - - 134 - - - - - 150 - - - - - 136 - - - - - 144 - - - - - 129 - - - - - 143 - - - - - 236 - - - - - 131 - - - YES - - - - - - 149 - - - - - 145 - - - - - 130 - - - - - 24 - - - YES - - - - - - - - - 92 - - - - - 5 - - - - - 239 - - - - - 23 - - - - - 295 - - - YES - - - - - - 296 - - - YES - - - - - - 420 - - - - - 490 - - - YES - - - - - - 491 - - - YES - - - - - - 492 - - - - - 494 - - - - - 536 - - - - - - - YES - - YES - -1.IBPluginDependency - -2.IBPluginDependency - -3.IBPluginDependency - 129.IBPluginDependency - 130.IBPluginDependency - 131.IBPluginDependency - 134.IBPluginDependency - 136.IBPluginDependency - 143.IBPluginDependency - 144.IBPluginDependency - 145.IBPluginDependency - 149.IBPluginDependency - 150.IBPluginDependency - 19.IBPluginDependency - 23.IBPluginDependency - 236.IBPluginDependency - 239.IBPluginDependency - 24.IBPluginDependency - 29.IBPluginDependency - 295.IBPluginDependency - 296.IBPluginDependency - 420.IBPluginDependency - 490.IBPluginDependency - 491.IBPluginDependency - 492.IBPluginDependency - 494.IBPluginDependency - 5.IBPluginDependency - 536.IBPluginDependency - 56.IBPluginDependency - 57.IBPluginDependency - 58.IBPluginDependency - 92.IBPluginDependency - - - YES - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - - - YES - - - - - - YES - - - - - 541 - - - - YES - - AppController - NSObject - - YES - - YES - exitFullScreen: - toggleFullScreen: - - - YES - id - id - - - - YES - - YES - exitFullScreen: - toggleFullScreen: - - - YES - - exitFullScreen: - id - - - toggleFullScreen: - id - - - - - YES - - YES - glView - window - - - YES - EAGLView - NSWindow - - - - YES - - YES - glView - window - - - YES - - glView - EAGLView - - - window - NSWindow - - - - - IBProjectSource - ./Classes/AppController.h - - - - EAGLView - NSOpenGLView - - IBProjectSource - ./Classes/EAGLView.h - - - - - 0 - IBCocoaFramework - - com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 - - - YES - 3 - - YES - - YES - NSMenuCheckmark - NSMenuMixedState - - - YES - {11, 11} - {10, 3} - - - - diff --git a/samples/Cpp/SimpleGame/proj.mac/main.cpp b/samples/Cpp/SimpleGame/proj.mac/main.cpp deleted file mode 100644 index edc200d976..0000000000 --- a/samples/Cpp/SimpleGame/proj.mac/main.cpp +++ /dev/null @@ -1,36 +0,0 @@ -/**************************************************************************** - Copyright (c) 2010 cocos2d-x.org - - http://www.cocos2d-x.org - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - THE SOFTWARE. - ****************************************************************************/ - -#include "AppDelegate.h" - -USING_NS_CC; - -int main(int argc, char *argv[]) -{ - AppDelegate app; - EGLView eglView; - eglView.init("SimpleGame",900,640); - return Application::getInstance()->run(); -} - diff --git a/samples/Cpp/SimpleGame/proj.win32/SimpleGame.vcxproj b/samples/Cpp/SimpleGame/proj.win32/SimpleGame.vcxproj deleted file mode 100644 index cb3c74751e..0000000000 --- a/samples/Cpp/SimpleGame/proj.win32/SimpleGame.vcxproj +++ /dev/null @@ -1,151 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {E0E282F4-8487-452C-BFAB-CB960EB4D22F} - SimpleGame - Win32Proj - - - - Application - Unicode - true - v100 - v110 - v110_xp - - - Application - Unicode - v100 - v110 - v110_xp - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration).win32\ - $(Configuration).win32\ - true - $(SolutionDir)$(Configuration).win32\ - $(Configuration).win32\ - false - AllRules.ruleset - - - AllRules.ruleset - - - - - $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath) - - - $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath) - - - - Disabled - ..\Classes;$(EngineRoot)cocos\audio\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - 4267;4251;4244;%(DisableSpecificWarnings) - - - $(OutDir)$(ProjectName).exe - $(OutDir);%(AdditionalLibraryDirectories) - true - Windows - MachineX86 - libcocos2d.lib;libchipmunk.lib;%(AdditionalDependencies) - - - - - - - - - MaxSpeed - true - ..\Classes;$(EngineRoot)cocos\audio\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - 4267;4251;4244;%(DisableSpecificWarnings) - - - libcocos2d.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).exe - $(OutDir);%(AdditionalLibraryDirectories) - true - Windows - true - true - MachineX86 - - - - - - - - - - - - - - - - - - - - - {98a51ba8-fc3a-415b-ac8f-8c7bd464e93e} - false - - - {f8edd7fa-9a51-4e80-baeb-860825d2eac6} - - - {207bc7a9-ccf1-4f2f-a04d-45f72242ae25} - - - - - - \ No newline at end of file diff --git a/samples/Cpp/SimpleGame/proj.win32/SimpleGame.vcxproj.filters b/samples/Cpp/SimpleGame/proj.win32/SimpleGame.vcxproj.filters deleted file mode 100644 index cf39562aaa..0000000000 --- a/samples/Cpp/SimpleGame/proj.win32/SimpleGame.vcxproj.filters +++ /dev/null @@ -1,41 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - - - Classes - - - Classes - - - win32 - - - Classes - - - - - Classes - - - Classes - - - win32 - - - Classes - - - \ No newline at end of file diff --git a/samples/Cpp/SimpleGame/proj.win32/SimpleGame.vcxproj.user b/samples/Cpp/SimpleGame/proj.win32/SimpleGame.vcxproj.user deleted file mode 100644 index 32a6296820..0000000000 --- a/samples/Cpp/SimpleGame/proj.win32/SimpleGame.vcxproj.user +++ /dev/null @@ -1,11 +0,0 @@ - - - - $(ProjectDir)..\Resources - WindowsLocalDebugger - - - $(ProjectDir)..\Resources - WindowsLocalDebugger - - \ No newline at end of file diff --git a/samples/Cpp/SimpleGame/proj.win32/main.cpp b/samples/Cpp/SimpleGame/proj.win32/main.cpp deleted file mode 100644 index d819bb02e0..0000000000 --- a/samples/Cpp/SimpleGame/proj.win32/main.cpp +++ /dev/null @@ -1,20 +0,0 @@ -#include "main.h" -#include "../Classes/AppDelegate.h" -#include "CCEGLView.h" - -USING_NS_CC; - -int APIENTRY _tWinMain(HINSTANCE hInstance, - HINSTANCE hPrevInstance, - LPTSTR lpCmdLine, - int nCmdShow) -{ - UNREFERENCED_PARAMETER(hPrevInstance); - UNREFERENCED_PARAMETER(lpCmdLine); - - // create the application instance - AppDelegate app; - EGLView eglView; - eglView.init("SimpleGame",900,640); - return Application::getInstance()->run(); -} diff --git a/samples/Cpp/SimpleGame/proj.win32/main.h b/samples/Cpp/SimpleGame/proj.win32/main.h deleted file mode 100644 index e74708bdf2..0000000000 --- a/samples/Cpp/SimpleGame/proj.win32/main.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef __MAIN_H__ -#define __MAIN_H__ - -#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers - -// Windows Header Files: -#include -#include - -// C RunTime Header Files -#include "CCStdC.h" - -#endif // __MAIN_H__ diff --git a/samples/Cpp/TestCpp/Classes/AppDelegate.h b/samples/Cpp/TestCpp/Classes/AppDelegate.h deleted file mode 100644 index 18ee8aeb63..0000000000 --- a/samples/Cpp/TestCpp/Classes/AppDelegate.h +++ /dev/null @@ -1,38 +0,0 @@ -#ifndef _APP_DELEGATE_H_ -#define _APP_DELEGATE_H_ - -#include "cocos2d.h" - -/** -@brief The cocos2d Application. - -The reason for implement as private inheritance is to hide some interface call by Director. -*/ -class AppDelegate : private cocos2d::Application -{ -public: - AppDelegate(); - virtual ~AppDelegate(); - - /** - @brief Implement Director and Scene init code here. - @return true Initialize success, app continue. - @return false Initialize failed, app terminate. - */ - virtual bool applicationDidFinishLaunching(); - - /** - @brief The function be called when the application enter background - @param the pointer of the application - */ - virtual void applicationDidEnterBackground(); - - /** - @brief The function be called when the application enter foreground - @param the pointer of the application - */ - virtual void applicationWillEnterForeground(); -}; - -#endif // _APP_DELEGATE_H_ - diff --git a/samples/Cpp/TestCpp/Resources/.gitignore b/samples/Cpp/TestCpp/Resources/.gitignore deleted file mode 100644 index 1d65afe366..0000000000 --- a/samples/Cpp/TestCpp/Resources/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -#Do now ignore Marmalade icf files -!*.icf diff --git a/samples/Cpp/TestCpp/Resources/background-music-aac.wav.REMOVED.git-id b/samples/Cpp/TestCpp/Resources/background-music-aac.wav.REMOVED.git-id deleted file mode 100644 index 584ed4de8a..0000000000 --- a/samples/Cpp/TestCpp/Resources/background-music-aac.wav.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -db5624cd760ef3e8dfad2f751d94fac652d6667f \ No newline at end of file diff --git a/samples/Cpp/TestCpp/proj.android/.classpath b/samples/Cpp/TestCpp/proj.android/.classpath deleted file mode 100644 index c06dfcb8e5..0000000000 --- a/samples/Cpp/TestCpp/proj.android/.classpath +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/samples/Cpp/TestCpp/proj.android/.settings/org.eclipse.cdt.codan.core.prefs b/samples/Cpp/TestCpp/proj.android/.settings/org.eclipse.cdt.codan.core.prefs deleted file mode 100644 index bad4196993..0000000000 --- a/samples/Cpp/TestCpp/proj.android/.settings/org.eclipse.cdt.codan.core.prefs +++ /dev/null @@ -1,68 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.cdt.codan.checkers.errnoreturn=-Warning -org.eclipse.cdt.codan.checkers.errnoreturn.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},implicit\=>false} -org.eclipse.cdt.codan.checkers.errreturnvalue=-Error -org.eclipse.cdt.codan.checkers.errreturnvalue.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.checkers.noreturn=-Error -org.eclipse.cdt.codan.checkers.noreturn.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},implicit\=>false} -org.eclipse.cdt.codan.internal.checkers.AbstractClassCreation=-Error -org.eclipse.cdt.codan.internal.checkers.AbstractClassCreation.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.AmbiguousProblem=-Error -org.eclipse.cdt.codan.internal.checkers.AmbiguousProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.AssignmentInConditionProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.AssignmentInConditionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.AssignmentToItselfProblem=-Error -org.eclipse.cdt.codan.internal.checkers.AssignmentToItselfProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.CaseBreakProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.CaseBreakProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},no_break_comment\=>"no break",last_case_param\=>true,empty_case_param\=>false} -org.eclipse.cdt.codan.internal.checkers.CatchByReference=-Warning -org.eclipse.cdt.codan.internal.checkers.CatchByReference.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},unknown\=>false,exceptions\=>()} -org.eclipse.cdt.codan.internal.checkers.CircularReferenceProblem=-Error -org.eclipse.cdt.codan.internal.checkers.CircularReferenceProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.ClassMembersInitialization=-Warning -org.eclipse.cdt.codan.internal.checkers.ClassMembersInitialization.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},skip\=>true} -org.eclipse.cdt.codan.internal.checkers.FieldResolutionProblem=-Error -org.eclipse.cdt.codan.internal.checkers.FieldResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.FunctionResolutionProblem=-Error -org.eclipse.cdt.codan.internal.checkers.FunctionResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.InvalidArguments=-Error -org.eclipse.cdt.codan.internal.checkers.InvalidArguments.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.InvalidTemplateArgumentsProblem=-Error -org.eclipse.cdt.codan.internal.checkers.InvalidTemplateArgumentsProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.LabelStatementNotFoundProblem=-Error -org.eclipse.cdt.codan.internal.checkers.LabelStatementNotFoundProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.MemberDeclarationNotFoundProblem=-Error -org.eclipse.cdt.codan.internal.checkers.MemberDeclarationNotFoundProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.MethodResolutionProblem=-Error -org.eclipse.cdt.codan.internal.checkers.MethodResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.NamingConventionFunctionChecker=-Info -org.eclipse.cdt.codan.internal.checkers.NamingConventionFunctionChecker.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},pattern\=>"^[a-z]",macro\=>true,exceptions\=>()} -org.eclipse.cdt.codan.internal.checkers.NonVirtualDestructorProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.NonVirtualDestructorProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.OverloadProblem=-Error -org.eclipse.cdt.codan.internal.checkers.OverloadProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.RedeclarationProblem=-Error -org.eclipse.cdt.codan.internal.checkers.RedeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.RedefinitionProblem=-Error -org.eclipse.cdt.codan.internal.checkers.RedefinitionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.ReturnStyleProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.ReturnStyleProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.ScanfFormatStringSecurityProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.ScanfFormatStringSecurityProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.StatementHasNoEffectProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.StatementHasNoEffectProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true,exceptions\=>()} -org.eclipse.cdt.codan.internal.checkers.SuggestedParenthesisProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.SuggestedParenthesisProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},paramNot\=>false} -org.eclipse.cdt.codan.internal.checkers.SuspiciousSemicolonProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.SuspiciousSemicolonProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},else\=>false,afterelse\=>false} -org.eclipse.cdt.codan.internal.checkers.TypeResolutionProblem=-Error -org.eclipse.cdt.codan.internal.checkers.TypeResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.UnusedFunctionDeclarationProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.UnusedFunctionDeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true} -org.eclipse.cdt.codan.internal.checkers.UnusedStaticFunctionProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.UnusedStaticFunctionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true} -org.eclipse.cdt.codan.internal.checkers.UnusedVariableDeclarationProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.UnusedVariableDeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true,exceptions\=>("@(\#)","$Id")} -org.eclipse.cdt.codan.internal.checkers.VariableResolutionProblem=-Error -org.eclipse.cdt.codan.internal.checkers.VariableResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -useParentScope=false diff --git a/samples/Cpp/TestCpp/proj.android/README.md b/samples/Cpp/TestCpp/proj.android/README.md deleted file mode 100644 index 312835611a..0000000000 --- a/samples/Cpp/TestCpp/proj.android/README.md +++ /dev/null @@ -1,87 +0,0 @@ -## Prerequisites: - -* Android NDK -* Android SDK **OR** Eclipse ADT Bundle -* Android AVD target installed - -## Building project - -There are two ways of building Android projects. - -1. Eclipse -2. Command Line - -### Import Project in Eclipse - -#### Features: - -1. Complete workflow from Eclipse, including: - * Build C++. - * Clean C++. - * Build and Run whole project. - * Logcat view. - * Debug Java code. - * Javascript editor. - * Project management. -2. True C++ editing, including: - * Code completion. - * Jump to definition. - * Refactoring tools etc. - * Quick open C++ files. - - -#### Setup Eclipse Environment (only once) - - -**NOTE:** This step needs to be done only once to setup the Eclipse environment for cocos2d-x projects. Skip this section if you've done this before. - -1. Download Eclipse ADT bundle from [Google ADT homepage](http://developer.android.com/sdk/index.html) - - **OR** - - Install Eclipse with Java. Add ADT and CDT plugins. - -2. Only for Windows - 1. Install [Cygwin](http://www.cygwin.com/) with make (select make package from the list during the install). - 2. Add `Cygwin\bin` directory to system PATH variable. - 3. Add this line `none /cygdrive cygdrive binary,noacl,posix=0,user 0 0` to `Cygwin\etc\fstab` file. - -3. Set up Variables: - 1. Path Variable `COCOS2DX`: - * Eclipse->Preferences->General->Workspace->**Linked Resources** - * Click **New** button to add a Path Variable `COCOS2DX` pointing to the root cocos2d-x directory. - ![Example](https://lh5.googleusercontent.com/-oPpk9kg3e5w/UUOYlq8n7aI/AAAAAAAAsdQ/zLA4eghBH9U/s400/cocos2d-x-eclipse-vars.png) - - 2. C/C++ Environment Variable `NDK_ROOT`: - * Eclipse->Preferences->C/C++->Build->**Environment**. - * Click **Add** button and add a new variable `NDK_ROOT` pointing to the root NDK directory. - ![Example](https://lh3.googleusercontent.com/-AVcY8IAT0_g/UUOYltoRobI/AAAAAAAAsdM/22D2J9u3sig/s400/cocos2d-x-eclipse-ndk.png) - * Only for Windows: Add new variables **CYGWIN** with value `nodosfilewarning` and **SHELLOPTS** with value `igncr` - -4. Import libcocos2dx library project: - 1. File->New->Project->Android Project From Existing Code. - 2. Click **Browse** button and open `cocos2d-x/cocos2dx/platform/android/java` directory. - 3. Click **Finish** to add project. - -#### Adding and running from Eclipse - -![Example](https://lh3.googleusercontent.com/-SLBOu6e3QbE/UUOcOXYaGqI/AAAAAAAAsdo/tYBY2SylOSM/s288/cocos2d-x-eclipse-project-from-code.png) ![Import](https://lh5.googleusercontent.com/-XzC9Pn65USc/UUOcOTAwizI/AAAAAAAAsdk/4b6YM-oim9Y/s400/cocos2d-x-eclipse-import-project.png) - -1. File->New->Project->Android Project From Existing Code -2. **Browse** to your project directory. eg: `cocos2d-x/cocos2dx/samples/Cpp/TestCpp/proj.android/` -3. Add the project -4. Click **Run** or **Debug** to compile C++ followed by Java and to run on connected device or emulator. - - -### Running project from Command Line - - $ cd cocos2d-x/samples/Cpp/TestCpp/proj.android/ - $ export NDK_ROOT=/path/to/ndk - $ ./build_native.sh - $ ant debug install - -If the last command results in sdk.dir missing error then do: - - $ android list target - $ android update project -p . -t (id from step 6) - $ android update project -p cocos2d-x/cocos2dx/platform/android/java/ -t (id from step 6) diff --git a/samples/Cpp/TestCpp/proj.android/ant.properties b/samples/Cpp/TestCpp/proj.android/ant.properties deleted file mode 100644 index b0971e891e..0000000000 --- a/samples/Cpp/TestCpp/proj.android/ant.properties +++ /dev/null @@ -1,17 +0,0 @@ -# This file is used to override default values used by the Ant build system. -# -# This file must be checked into Version Control Systems, as it is -# integral to the build system of your project. - -# This file is only used by the Ant script. - -# You can use this to override default values such as -# 'source.dir' for the location of your java source folder and -# 'out.dir' for the location of your output folder. - -# You can also use it define how the release builds are signed by declaring -# the following properties: -# 'key.store' for the location of your keystore and -# 'key.alias' for the name of the key to use. -# The password will be asked during the build when you use the 'release' target. - diff --git a/samples/Cpp/TestCpp/proj.win32/main.h b/samples/Cpp/TestCpp/proj.win32/main.h deleted file mode 100644 index e74708bdf2..0000000000 --- a/samples/Cpp/TestCpp/proj.win32/main.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef __MAIN_H__ -#define __MAIN_H__ - -#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers - -// Windows Header Files: -#include -#include - -// C RunTime Header Files -#include "CCStdC.h" - -#endif // __MAIN_H__ diff --git a/samples/Javascript/CocosDragonJS/Classes/AppDelegate.cpp b/samples/Javascript/CocosDragonJS/Classes/AppDelegate.cpp deleted file mode 100644 index d8ec78b296..0000000000 --- a/samples/Javascript/CocosDragonJS/Classes/AppDelegate.cpp +++ /dev/null @@ -1,162 +0,0 @@ -#include "AppDelegate.h" - -#include -#include - -#include "cocos2d.h" -#include "SimpleAudioEngine.h" -#include "ScriptingCore.h" -#include "jsb_cocos2dx_auto.hpp" -#include "jsb_cocos2dx_extension_auto.hpp" -#include "jsb_cocos2dx_builder_auto.hpp" -#include "extension/jsb_cocos2dx_extension_manual.h" -#include "cocos2d_specifics.hpp" -#include "cocosbuilder/js_bindings_ccbreader.h" -#include "localstorage/js_bindings_system_registration.h" -#include "chipmunk/js_bindings_chipmunk_registration.h" -#include "jsb_opengl_registration.h" - -USING_NS_CC; -using namespace CocosDenshion; -using namespace std; - -AppDelegate::AppDelegate() -{ -} - -AppDelegate::~AppDelegate() -{ - ScriptEngineManager::destroyInstance(); -} - -bool AppDelegate::applicationDidFinishLaunching() -{ - // initialize director - auto pDirector = Director::getInstance(); - pDirector->setOpenGLView(EGLView::getInstance()); - pDirector->setProjection(Director::Projection::_2D); - - - FileUtils::getInstance()->addSearchPath("script"); - - auto screenSize = EGLView::getInstance()->getFrameSize(); - - auto designSize = Size(320, 480); - auto resourceSize = Size(320, 480); - - std::vector resDirOrders; - - Platform platform = Application::getInstance()->getTargetPlatform(); - if (platform == Application::Platform::OS_IPHONE || platform == Application::Platform::OS_IPAD || platform == Application::Platform::OS_MAC) - { - std::vector searchPaths = FileUtils::getInstance()->getSearchPaths(); - searchPaths.insert(searchPaths.begin(), "Published files iOS"); - FileUtils::getInstance()->setSearchPaths(searchPaths); - if (screenSize.height > 1024) - { - resourceSize = Size(1536, 2048); - resDirOrders.push_back("resources-ipadhd"); - resDirOrders.push_back("resources-ipad"); - resDirOrders.push_back("resources-iphonehd"); - } - else if (screenSize.height > 960) - { - resourceSize = Size(768, 1024); - resDirOrders.push_back("resources-ipad"); - resDirOrders.push_back("resources-iphonehd"); - } - else if (screenSize.height > 480) - { - resourceSize = Size(640, 960); - resDirOrders.push_back("resources-iphonehd"); - resDirOrders.push_back("resources-iphone"); - } - else - { - resourceSize = Size(320, 480); - resDirOrders.push_back("resources-iphone"); - } - - } - else if (platform == Application::Platform::OS_ANDROID || platform == Application::Platform::OS_WINDOWS) - { - if (screenSize.height > 960) - { - resourceSize = Size(1280, 1920); - resDirOrders.push_back("resources-xlarge"); - resDirOrders.push_back("resources-large"); - resDirOrders.push_back("resources-medium"); - resDirOrders.push_back("resources-small"); - } - else if (screenSize.height > 720) - { - resourceSize = Size(640, 960); - resDirOrders.push_back("resources-large"); - resDirOrders.push_back("resources-medium"); - resDirOrders.push_back("resources-small"); - } - else if (screenSize.height > 480) - { - resourceSize = Size(480, 720); - resDirOrders.push_back("resources-medium"); - resDirOrders.push_back("resources-small"); - } - else - { - resourceSize = Size(320, 480); - resDirOrders.push_back("resources-small"); - } - } - - FileUtils::getInstance()->setSearchResolutionsOrder(resDirOrders); - - pDirector->setContentScaleFactor(resourceSize.width/designSize.width); - - EGLView::getInstance()->setDesignResolutionSize(designSize.width, designSize.height, ResolutionPolicy::NO_BORDER); - - // turn on display FPS - pDirector->setDisplayStats(true); - - // set FPS. the default value is 1.0/60 if you don't call this - pDirector->setAnimationInterval(1.0 / 60); - - ScriptingCore* sc = ScriptingCore::getInstance(); - sc->addRegisterCallback(register_all_cocos2dx); - sc->addRegisterCallback(register_all_cocos2dx_extension); - sc->addRegisterCallback(register_cocos2dx_js_extensions); - sc->addRegisterCallback(register_all_cocos2dx_extension_manual); - sc->addRegisterCallback(register_all_cocos2dx_builder); - sc->addRegisterCallback(register_CCBuilderReader); - sc->addRegisterCallback(jsb_register_system); - sc->addRegisterCallback(JSB_register_opengl); - sc->addRegisterCallback(jsb_register_chipmunk); - - sc->start(); - -#if defined(COCOS2D_DEBUG) && (COCOS2D_DEBUG > 0) - sc->enableDebugger(); -#endif - - js_log("RUNNING Main"); - auto pEngine = ScriptingCore::getInstance(); - ScriptEngineManager::getInstance()->setScriptEngine(pEngine); - ScriptingCore::getInstance()->runScript("main.js"); - - return true; -} - -// This function will be called when the app is inactive. When comes a phone call,it's be invoked too -void AppDelegate::applicationDidEnterBackground() -{ - Director::getInstance()->stopAnimation(); - SimpleAudioEngine::getInstance()->pauseBackgroundMusic(); - SimpleAudioEngine::getInstance()->pauseAllEffects(); -} - -// this function will be called when the app is active again -void AppDelegate::applicationWillEnterForeground() -{ - Director::getInstance()->startAnimation(); - SimpleAudioEngine::getInstance()->resumeBackgroundMusic(); - SimpleAudioEngine::getInstance()->resumeAllEffects(); -} diff --git a/samples/Javascript/CocosDragonJS/proj.android/.project b/samples/Javascript/CocosDragonJS/proj.android/.project deleted file mode 100644 index 0a52fa2ab9..0000000000 --- a/samples/Javascript/CocosDragonJS/proj.android/.project +++ /dev/null @@ -1,70 +0,0 @@ - - - CocosDragonJS - - - - - - com.android.ide.eclipse.adt.ResourceManagerBuilder - - - - - com.android.ide.eclipse.adt.PreCompilerBuilder - - - - - org.eclipse.jdt.core.javabuilder - - - - - com.android.ide.eclipse.adt.ApkBuilder - - - - - org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder - full,incremental, - - - - - - com.android.ide.eclipse.adt.AndroidNature - org.eclipse.jdt.core.javanature - org.eclipse.cdt.core.cnature - org.eclipse.cdt.core.ccnature - org.eclipse.cdt.managedbuilder.core.managedBuildNature - org.eclipse.cdt.managedbuilder.core.ScannerConfigNature - - - - Classes - 2 - COCOS2DX/samples/Javascript/CocosDragonJS/Classes - - - cocos2dx - 2 - COCOS2DX/cocos2dx - - - cocosdenshion - 2 - COCOS2DX/CocosDenshion - - - extensions - 2 - COCOS2DX/extensions - - - scripting - 2 - COCOS2DX/scripting - - - diff --git a/samples/Javascript/CocosDragonJS/proj.android/.settings/org.eclipse.cdt.codan.core.prefs b/samples/Javascript/CocosDragonJS/proj.android/.settings/org.eclipse.cdt.codan.core.prefs deleted file mode 100644 index bad4196993..0000000000 --- a/samples/Javascript/CocosDragonJS/proj.android/.settings/org.eclipse.cdt.codan.core.prefs +++ /dev/null @@ -1,68 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.cdt.codan.checkers.errnoreturn=-Warning -org.eclipse.cdt.codan.checkers.errnoreturn.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},implicit\=>false} -org.eclipse.cdt.codan.checkers.errreturnvalue=-Error -org.eclipse.cdt.codan.checkers.errreturnvalue.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.checkers.noreturn=-Error -org.eclipse.cdt.codan.checkers.noreturn.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},implicit\=>false} -org.eclipse.cdt.codan.internal.checkers.AbstractClassCreation=-Error -org.eclipse.cdt.codan.internal.checkers.AbstractClassCreation.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.AmbiguousProblem=-Error -org.eclipse.cdt.codan.internal.checkers.AmbiguousProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.AssignmentInConditionProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.AssignmentInConditionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.AssignmentToItselfProblem=-Error -org.eclipse.cdt.codan.internal.checkers.AssignmentToItselfProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.CaseBreakProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.CaseBreakProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},no_break_comment\=>"no break",last_case_param\=>true,empty_case_param\=>false} -org.eclipse.cdt.codan.internal.checkers.CatchByReference=-Warning -org.eclipse.cdt.codan.internal.checkers.CatchByReference.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},unknown\=>false,exceptions\=>()} -org.eclipse.cdt.codan.internal.checkers.CircularReferenceProblem=-Error -org.eclipse.cdt.codan.internal.checkers.CircularReferenceProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.ClassMembersInitialization=-Warning -org.eclipse.cdt.codan.internal.checkers.ClassMembersInitialization.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},skip\=>true} -org.eclipse.cdt.codan.internal.checkers.FieldResolutionProblem=-Error -org.eclipse.cdt.codan.internal.checkers.FieldResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.FunctionResolutionProblem=-Error -org.eclipse.cdt.codan.internal.checkers.FunctionResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.InvalidArguments=-Error -org.eclipse.cdt.codan.internal.checkers.InvalidArguments.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.InvalidTemplateArgumentsProblem=-Error -org.eclipse.cdt.codan.internal.checkers.InvalidTemplateArgumentsProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.LabelStatementNotFoundProblem=-Error -org.eclipse.cdt.codan.internal.checkers.LabelStatementNotFoundProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.MemberDeclarationNotFoundProblem=-Error -org.eclipse.cdt.codan.internal.checkers.MemberDeclarationNotFoundProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.MethodResolutionProblem=-Error -org.eclipse.cdt.codan.internal.checkers.MethodResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.NamingConventionFunctionChecker=-Info -org.eclipse.cdt.codan.internal.checkers.NamingConventionFunctionChecker.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},pattern\=>"^[a-z]",macro\=>true,exceptions\=>()} -org.eclipse.cdt.codan.internal.checkers.NonVirtualDestructorProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.NonVirtualDestructorProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.OverloadProblem=-Error -org.eclipse.cdt.codan.internal.checkers.OverloadProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.RedeclarationProblem=-Error -org.eclipse.cdt.codan.internal.checkers.RedeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.RedefinitionProblem=-Error -org.eclipse.cdt.codan.internal.checkers.RedefinitionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.ReturnStyleProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.ReturnStyleProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.ScanfFormatStringSecurityProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.ScanfFormatStringSecurityProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.StatementHasNoEffectProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.StatementHasNoEffectProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true,exceptions\=>()} -org.eclipse.cdt.codan.internal.checkers.SuggestedParenthesisProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.SuggestedParenthesisProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},paramNot\=>false} -org.eclipse.cdt.codan.internal.checkers.SuspiciousSemicolonProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.SuspiciousSemicolonProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},else\=>false,afterelse\=>false} -org.eclipse.cdt.codan.internal.checkers.TypeResolutionProblem=-Error -org.eclipse.cdt.codan.internal.checkers.TypeResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.UnusedFunctionDeclarationProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.UnusedFunctionDeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true} -org.eclipse.cdt.codan.internal.checkers.UnusedStaticFunctionProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.UnusedStaticFunctionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true} -org.eclipse.cdt.codan.internal.checkers.UnusedVariableDeclarationProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.UnusedVariableDeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true,exceptions\=>("@(\#)","$Id")} -org.eclipse.cdt.codan.internal.checkers.VariableResolutionProblem=-Error -org.eclipse.cdt.codan.internal.checkers.VariableResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -useParentScope=false diff --git a/samples/Javascript/CocosDragonJS/proj.android/AndroidManifest.xml b/samples/Javascript/CocosDragonJS/proj.android/AndroidManifest.xml deleted file mode 100644 index a215673a7c..0000000000 --- a/samples/Javascript/CocosDragonJS/proj.android/AndroidManifest.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/samples/Javascript/CocosDragonJS/proj.android/README.md b/samples/Javascript/CocosDragonJS/proj.android/README.md deleted file mode 100644 index 312835611a..0000000000 --- a/samples/Javascript/CocosDragonJS/proj.android/README.md +++ /dev/null @@ -1,87 +0,0 @@ -## Prerequisites: - -* Android NDK -* Android SDK **OR** Eclipse ADT Bundle -* Android AVD target installed - -## Building project - -There are two ways of building Android projects. - -1. Eclipse -2. Command Line - -### Import Project in Eclipse - -#### Features: - -1. Complete workflow from Eclipse, including: - * Build C++. - * Clean C++. - * Build and Run whole project. - * Logcat view. - * Debug Java code. - * Javascript editor. - * Project management. -2. True C++ editing, including: - * Code completion. - * Jump to definition. - * Refactoring tools etc. - * Quick open C++ files. - - -#### Setup Eclipse Environment (only once) - - -**NOTE:** This step needs to be done only once to setup the Eclipse environment for cocos2d-x projects. Skip this section if you've done this before. - -1. Download Eclipse ADT bundle from [Google ADT homepage](http://developer.android.com/sdk/index.html) - - **OR** - - Install Eclipse with Java. Add ADT and CDT plugins. - -2. Only for Windows - 1. Install [Cygwin](http://www.cygwin.com/) with make (select make package from the list during the install). - 2. Add `Cygwin\bin` directory to system PATH variable. - 3. Add this line `none /cygdrive cygdrive binary,noacl,posix=0,user 0 0` to `Cygwin\etc\fstab` file. - -3. Set up Variables: - 1. Path Variable `COCOS2DX`: - * Eclipse->Preferences->General->Workspace->**Linked Resources** - * Click **New** button to add a Path Variable `COCOS2DX` pointing to the root cocos2d-x directory. - ![Example](https://lh5.googleusercontent.com/-oPpk9kg3e5w/UUOYlq8n7aI/AAAAAAAAsdQ/zLA4eghBH9U/s400/cocos2d-x-eclipse-vars.png) - - 2. C/C++ Environment Variable `NDK_ROOT`: - * Eclipse->Preferences->C/C++->Build->**Environment**. - * Click **Add** button and add a new variable `NDK_ROOT` pointing to the root NDK directory. - ![Example](https://lh3.googleusercontent.com/-AVcY8IAT0_g/UUOYltoRobI/AAAAAAAAsdM/22D2J9u3sig/s400/cocos2d-x-eclipse-ndk.png) - * Only for Windows: Add new variables **CYGWIN** with value `nodosfilewarning` and **SHELLOPTS** with value `igncr` - -4. Import libcocos2dx library project: - 1. File->New->Project->Android Project From Existing Code. - 2. Click **Browse** button and open `cocos2d-x/cocos2dx/platform/android/java` directory. - 3. Click **Finish** to add project. - -#### Adding and running from Eclipse - -![Example](https://lh3.googleusercontent.com/-SLBOu6e3QbE/UUOcOXYaGqI/AAAAAAAAsdo/tYBY2SylOSM/s288/cocos2d-x-eclipse-project-from-code.png) ![Import](https://lh5.googleusercontent.com/-XzC9Pn65USc/UUOcOTAwizI/AAAAAAAAsdk/4b6YM-oim9Y/s400/cocos2d-x-eclipse-import-project.png) - -1. File->New->Project->Android Project From Existing Code -2. **Browse** to your project directory. eg: `cocos2d-x/cocos2dx/samples/Cpp/TestCpp/proj.android/` -3. Add the project -4. Click **Run** or **Debug** to compile C++ followed by Java and to run on connected device or emulator. - - -### Running project from Command Line - - $ cd cocos2d-x/samples/Cpp/TestCpp/proj.android/ - $ export NDK_ROOT=/path/to/ndk - $ ./build_native.sh - $ ant debug install - -If the last command results in sdk.dir missing error then do: - - $ android list target - $ android update project -p . -t (id from step 6) - $ android update project -p cocos2d-x/cocos2dx/platform/android/java/ -t (id from step 6) diff --git a/samples/Javascript/CocosDragonJS/proj.android/build.xml b/samples/Javascript/CocosDragonJS/proj.android/build.xml deleted file mode 100644 index b5b34f9013..0000000000 --- a/samples/Javascript/CocosDragonJS/proj.android/build.xml +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/samples/Javascript/CocosDragonJS/proj.android/jni/Android.mk b/samples/Javascript/CocosDragonJS/proj.android/jni/Android.mk deleted file mode 100644 index 1e65b8e7a5..0000000000 --- a/samples/Javascript/CocosDragonJS/proj.android/jni/Android.mk +++ /dev/null @@ -1,31 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE := cocosdragonjs_shared - -LOCAL_MODULE_FILENAME := libcocosdragonjs - -LOCAL_SRC_FILES := cocosdragonjs/main.cpp \ - ../../Classes/AppDelegate.cpp - -LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../Classes - -LOCAL_WHOLE_STATIC_LIBRARIES := cocos_jsb_static -LOCAL_WHOLE_STATIC_LIBRARIES += jsb_chipmunk_static -LOCAL_WHOLE_STATIC_LIBRARIES += jsb_extension_static -LOCAL_WHOLE_STATIC_LIBRARIES += jsb_localstorage_static -LOCAL_WHOLE_STATIC_LIBRARIES += jsb_network_static -LOCAL_WHOLE_STATIC_LIBRARIES += jsb_builder_static - -LOCAL_EXPORT_CFLAGS := -DCOCOS2D_DEBUG=2 -DCOCOS2D_JAVASCRIPT - -include $(BUILD_SHARED_LIBRARY) - -$(call import-module,scripting/javascript/bindings) -$(call import-module,scripting/javascript/bindings/chipmunk) -$(call import-module,scripting/javascript/bindings/extension) -$(call import-module,scripting/javascript/bindings/localstorage) -$(call import-module,scripting/javascript/bindings/network) -$(call import-module,scripting/javascript/bindings/cocosbuilder) - diff --git a/samples/Javascript/CocosDragonJS/proj.android/jni/Application.mk b/samples/Javascript/CocosDragonJS/proj.android/jni/Application.mk deleted file mode 100644 index 3666985a1f..0000000000 --- a/samples/Javascript/CocosDragonJS/proj.android/jni/Application.mk +++ /dev/null @@ -1,6 +0,0 @@ -APP_STL := gnustl_static - -# add -Wno-literal-suffix to avoid warning: warning: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wliteral-suffix] -# in NDK_ROOT/arch-arm/usr/include/sys/cdefs_elf.h:35:28: when using ndk-r9 -APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -DCOCOS2D_DEBUG=1 -std=c++11 -Wno-literal-suffix -fsigned-char - diff --git a/samples/Javascript/CocosDragonJS/proj.android/ndkgdb.sh b/samples/Javascript/CocosDragonJS/proj.android/ndkgdb.sh deleted file mode 100755 index 779acc425f..0000000000 --- a/samples/Javascript/CocosDragonJS/proj.android/ndkgdb.sh +++ /dev/null @@ -1,47 +0,0 @@ -APPNAME="CocosDragonJS" -APP_ANDROID_NAME="org.cocos2dx.cocosdragonjs" - -if [ -z "${SDK_ROOT+aaa}" ]; then -# ... if SDK_ROOT is not set, use "$HOME/bin/android-sdk" - SDK_ROOT="$HOME/bin/android-sdk" -fi - -if [ -z "${NDK_ROOT+aaa}" ]; then -# ... if NDK_ROOT is not set, use "$HOME/bin/android-ndk" - NDK_ROOT="$HOME/bin/android-ndk" -fi - -if [ -z "${COCOS2DX_ROOT+aaa}" ]; then -# ... if COCOS2DX_ROOT is not set -# ... find current working directory - DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -# ... use paths relative to current directory - COCOS2DX_ROOT="$DIR/../../.." - APP_ROOT="$DIR/.." - APP_ANDROID_ROOT="$DIR" -else - APP_ROOT="$COCOS2DX_ROOT/samples/$APPNAME" - APP_ANDROID_ROOT="$COCOS2DX_ROOT/samples/$APPNAME/proj.android" -fi - -echo "NDK_ROOT = $NDK_ROOT" -echo "SDK_ROOT = $SDK_ROOT" -echo "COCOS2DX_ROOT = $COCOS2DX_ROOT" -echo "APP_ROOT = $APP_ROOT" -echo "APP_ANDROID_ROOT = $APP_ANDROID_ROOT" -echo "APP_ANDROID_NAME = $APP_ANDROID_NAME" - -echo -echo "Killing and restarting ${APP_ANDROID_NAME}" -echo - -set -x - -"${SDK_ROOT}"/platform-tools/adb shell am force-stop "${APP_ANDROID_NAME}" - -NDK_MODULE_PATH="${COCOS2DX_ROOT}":"${COCOS2DX_ROOT}"/cocos2dx/platform/third_party/android/prebuilt \ - "${NDK_ROOT}"/ndk-gdb \ - --adb="${SDK_ROOT}"/platform-tools/adb \ - --verbose \ - --start \ - --force diff --git a/samples/Javascript/CocosDragonJS/proj.android/proguard-project.txt b/samples/Javascript/CocosDragonJS/proj.android/proguard-project.txt deleted file mode 100644 index f2fe1559a2..0000000000 --- a/samples/Javascript/CocosDragonJS/proj.android/proguard-project.txt +++ /dev/null @@ -1,20 +0,0 @@ -# To enable ProGuard in your project, edit project.properties -# to define the proguard.config property as described in that file. -# -# Add project specific ProGuard rules here. -# By default, the flags in this file are appended to flags specified -# in ${sdk.dir}/tools/proguard/proguard-android.txt -# You can edit the include path and order by changing the ProGuard -# include property in project.properties. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# Add any project specific keep options here: - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} diff --git a/samples/Javascript/CocosDragonJS/proj.android/res/values/strings.xml b/samples/Javascript/CocosDragonJS/proj.android/res/values/strings.xml deleted file mode 100644 index 1cc07c9cad..0000000000 --- a/samples/Javascript/CocosDragonJS/proj.android/res/values/strings.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - CocosDragonJS - diff --git a/samples/Javascript/CocosDragonJS/proj.android/src/org/cocos2dx/cocosdragonjs/Cocos2dxActivity.java b/samples/Javascript/CocosDragonJS/proj.android/src/org/cocos2dx/cocosdragonjs/Cocos2dxActivity.java deleted file mode 100644 index bde3e3a5a0..0000000000 --- a/samples/Javascript/CocosDragonJS/proj.android/src/org/cocos2dx/cocosdragonjs/Cocos2dxActivity.java +++ /dev/null @@ -1,33 +0,0 @@ -package org.cocos2dx.cocosdragonjs; - -import android.app.NativeActivity; -import android.graphics.PixelFormat; -import android.os.Bundle; - -public class Cocos2dxActivity extends NativeActivity { - - @Override - protected void onCreate(Bundle savedInstanceState) { - // TODO Auto-generated method stub - super.onCreate(savedInstanceState); - - //For supports translucency - - //1.change "attribs" in cocos\2d\platform\android\nativeactivity.cpp - /*const EGLint attribs[] = { - EGL_SURFACE_TYPE, EGL_WINDOW_BIT, - EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT, - //EGL_BLUE_SIZE, 5, -->delete - //EGL_GREEN_SIZE, 6, -->delete - //EGL_RED_SIZE, 5, -->delete - EGL_BUFFER_SIZE, 32, //-->new field - EGL_DEPTH_SIZE, 16, - EGL_STENCIL_SIZE, 8, - EGL_NONE - };*/ - - //2.Set the format of window - // getWindow().setFormat(PixelFormat.TRANSLUCENT); - - } -} diff --git a/samples/Javascript/CocosDragonJS/proj.ios/AppController.mm b/samples/Javascript/CocosDragonJS/proj.ios/AppController.mm deleted file mode 100644 index ca23f1b7f8..0000000000 --- a/samples/Javascript/CocosDragonJS/proj.ios/AppController.mm +++ /dev/null @@ -1,119 +0,0 @@ -// -// testjsAppController.mm -// testjs -// -// Created by Rolando Abarca on 3/19/12. -// Copyright __MyCompanyName__ 2012. All rights reserved. -// -#import -#import "AppController.h" -#import "cocos2d.h" -#import "EAGLView.h" -#import "AppDelegate.h" - -#import "RootViewController.h" - -@implementation AppController - -#pragma mark - -#pragma mark Application lifecycle - -// cocos2d application instance -static AppDelegate s_sharedApplication; - -- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { - - // Override point for customization after application launch. - - // Add the view controller's view to the window and display. - window = [[UIWindow alloc] initWithFrame: [[UIScreen mainScreen] bounds]]; - CCEAGLView *__glView = [CCEAGLView viewWithFrame: [window bounds] - pixelFormat: kEAGLColorFormatRGBA8 - depthFormat: GL_DEPTH_COMPONENT16 //_OES - preserveBackbuffer: NO - sharegroup: nil - multiSampling: NO - numberOfSamples: 0 ]; - - // Use RootViewController manage CCEAGLView - viewController = [[RootViewController alloc] initWithNibName:nil bundle:nil]; - viewController.wantsFullScreenLayout = YES; - viewController.view = __glView; - - // Set RootViewController to window - if ( [[UIDevice currentDevice].systemVersion floatValue] < 6.0) - { - // warning: addSubView doesn't work on iOS6 - [window addSubview: viewController.view]; - } - else - { - // use this method on ios6 - [window setRootViewController:viewController]; - } - - [window makeKeyAndVisible]; - - [[UIApplication sharedApplication] setStatusBarHidden: YES]; - - cocos2d::Application::getInstance()->run(); - return YES; -} - - -- (void)applicationWillResignActive:(UIApplication *)application { - /* - Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state. - Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game. - */ - cocos2d::Director::getInstance()->pause(); -} - -- (void)applicationDidBecomeActive:(UIApplication *)application { - /* - Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface. - */ - cocos2d::Director::getInstance()->resume(); -} - -- (void)applicationDidEnterBackground:(UIApplication *)application { - /* - Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later. - If your application supports background execution, called instead of applicationWillTerminate: when the user quits. - */ - cocos2d::Application::getInstance()->applicationDidEnterBackground(); -} - -- (void)applicationWillEnterForeground:(UIApplication *)application { - /* - Called as part of transition from the background to the inactive state: here you can undo many of the changes made on entering the background. - */ - cocos2d::Application::getInstance()->applicationWillEnterForeground(); -} - -- (void)applicationWillTerminate:(UIApplication *)application { - /* - Called when the application is about to terminate. - See also applicationDidEnterBackground:. - */ -} - - -#pragma mark - -#pragma mark Memory management - -- (void)applicationDidReceiveMemoryWarning:(UIApplication *)application { - /* - Free up as much memory as possible by purging cached data objects that can be recreated (or reloaded from disk) later. - */ - cocos2d::Director::getInstance()->purgeCachedData(); -} - - -- (void)dealloc { - [super dealloc]; -} - - -@end - diff --git a/samples/Javascript/CocosDragonJS/proj.ios/Default-568h@2x.png.REMOVED.git-id b/samples/Javascript/CocosDragonJS/proj.ios/Default-568h@2x.png.REMOVED.git-id deleted file mode 100644 index 8f5838f3a8..0000000000 --- a/samples/Javascript/CocosDragonJS/proj.ios/Default-568h@2x.png.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -66c6d1cead373b45218424f6a82f370897e443e4 \ No newline at end of file diff --git a/samples/Javascript/CocosDragonJS/proj.ios/Default@2x.png.REMOVED.git-id b/samples/Javascript/CocosDragonJS/proj.ios/Default@2x.png.REMOVED.git-id deleted file mode 100644 index 8843505b20..0000000000 --- a/samples/Javascript/CocosDragonJS/proj.ios/Default@2x.png.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -84689888a14a2123d2b39f7f2f61be8c15207479 \ No newline at end of file diff --git a/samples/Javascript/CocosDragonJS/proj.ios/RootViewController.h b/samples/Javascript/CocosDragonJS/proj.ios/RootViewController.h deleted file mode 100644 index 11dfc4bf88..0000000000 --- a/samples/Javascript/CocosDragonJS/proj.ios/RootViewController.h +++ /dev/null @@ -1,33 +0,0 @@ -/**************************************************************************** - Copyright (c) 2010-2011 cocos2d-x.org - Copyright (c) 2010 Ricardo Quesada - - http://www.cocos2d-x.org - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - THE SOFTWARE. - ****************************************************************************/ - -#import - - -@interface RootViewController : UIViewController { - -} -- (BOOL)prefersStatusBarHidden; -@end diff --git a/samples/Javascript/CocosDragonJS/proj.mac/Icon.icns.REMOVED.git-id b/samples/Javascript/CocosDragonJS/proj.mac/Icon.icns.REMOVED.git-id deleted file mode 100644 index 9874ec6979..0000000000 --- a/samples/Javascript/CocosDragonJS/proj.mac/Icon.icns.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -3d09e8fb4f4ca1c1ae7ab0a6948db592c7c3d9a0 \ No newline at end of file diff --git a/samples/Javascript/CocosDragonJS/proj.mac/en.lproj/InfoPlist.strings b/samples/Javascript/CocosDragonJS/proj.mac/en.lproj/InfoPlist.strings deleted file mode 100644 index 477b28ff8f..0000000000 --- a/samples/Javascript/CocosDragonJS/proj.mac/en.lproj/InfoPlist.strings +++ /dev/null @@ -1,2 +0,0 @@ -/* Localized versions of Info.plist keys */ - diff --git a/samples/Javascript/CocosDragonJS/proj.mac/main.cpp b/samples/Javascript/CocosDragonJS/proj.mac/main.cpp deleted file mode 100644 index cc76835ef2..0000000000 --- a/samples/Javascript/CocosDragonJS/proj.mac/main.cpp +++ /dev/null @@ -1,36 +0,0 @@ -/**************************************************************************** - Copyright (c) 2010 cocos2d-x.org - - http://www.cocos2d-x.org - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - THE SOFTWARE. - ****************************************************************************/ - -#include "AppDelegate.h" -#include "cocos2d.h" - -USING_NS_CC; - -int main(int argc, char *argv[]) -{ - AppDelegate app; - EGLView eglView; - eglView.init("CocosDragonJS", 480, 720); - return Application::getInstance()->run(); -} diff --git a/samples/Javascript/CocosDragonJS/proj.win32/CocosDragonJS.vcxproj b/samples/Javascript/CocosDragonJS/proj.win32/CocosDragonJS.vcxproj deleted file mode 100644 index 2e7cc9a5d5..0000000000 --- a/samples/Javascript/CocosDragonJS/proj.win32/CocosDragonJS.vcxproj +++ /dev/null @@ -1,228 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {68ED0B4E-2BCA-45D2-9648-CEABEBD3B9D7} - CocosDragonJS - - - - Application - Unicode - v100 - v110 - v110_xp - - - Application - Unicode - v100 - v110 - v110_xp - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration).win32\ - $(Configuration).win32\ - false - $(SolutionDir)$(Configuration).win32\ - $(Configuration).win32\ - false - AllRules.ruleset - - - AllRules.ruleset - - - - - $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath) - - - $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath) - - - - _DEBUG;%(PreprocessorDefinitions) - false - Win32 - true - $(IntDir)testjs.tlb - testjs.h - - - testjs_i.c - testjs_p.c - - - Disabled - $(ProjectDir)..\Classes;$(EngineRoot);$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\scripting\auto-generated\js-bindings;$(EngineRoot)cocos\scripting\javascript\bindings;$(EngineRoot)cocos\audio\include;$(EngineRoot)external\spidermonkey\include\win32;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;%(AdditionalIncludeDirectories) - WIN32;_WINDOWS;STRICT;_DEBUG;DEBUG;XP_WIN;JS_HAVE___INTN;JS_INTPTR_TYPE=int;COCOS2D_DEBUG=1;COCOS2D_JAVASCRIPT=1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - false - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - 4267;4251;4244;%(DisableSpecificWarnings) - true - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(IntDir);%(AdditionalIncludeDirectories) - - - if not exist "$(OutDir)" mkdir "$(OutDir)" -xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\spidermonkey\prebuilt\win32\*.*" "$(OutDir)" - - - - libcurl_imp.lib;mozjs-25.0.lib;ws2_32.lib;sqlite3.lib;%(AdditionalDependencies) - $(OutDir);%(AdditionalLibraryDirectories) - true - Windows - MachineX86 - - - if not exist "$(OutDir)" mkdir "$(OutDir)" -if exist "$(OutDir)\CocosDragonJSRes" rd /s /q "$(OutDir)\CocosDragonJSRes" -mkdir "$(OutDir)\CocosDragonJSRes" -xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\javascript\script\*.js" "$(OutDir)\CocosDragonJSRes" /e /Y -xcopy "$(ProjectDir)..\..\Shared\games\CocosDragonJS\Published files Android" "$(OutDir)\CocosDragonJSRes\" /e /Y - - - Copy js and resource files. - - - - - NDEBUG;%(PreprocessorDefinitions) - false - Win32 - true - $(IntDir)testjs.tlb - testjs.h - - - testjs_i.c - testjs_p.c - - - $(ProjectDir)..\Classes;$(EngineRoot);$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\scripting\auto-generated\js-bindings;$(EngineRoot)cocos\scripting\javascript\bindings;$(EngineRoot)cocos\audio\include;$(EngineRoot)external\spidermonkey\include\win32;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;%(AdditionalIncludeDirectories) - WIN32;_WINDOWS;STRICT;NDEBUG;XP_WIN;JS_HAVE___INTN;JS_INTPTR_TYPE=int;CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_JAVASCRIPT=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - - - MultiThreadedDLL - - - Level3 - - - 4267;4251;4244;%(DisableSpecificWarnings) - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(IntDir);%(AdditionalIncludeDirectories) - - - if not exist "$(OutDir)" mkdir "$(OutDir)" -xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\spidermonkey\prebuilt\win32\*.*" "$(OutDir)" - - - - libcurl_imp.lib;mozjs-25.0.lib;ws2_32.lib;sqlite3.lib;%(AdditionalDependencies) - $(OutDir);%(AdditionalLibraryDirectories) - Windows - MachineX86 - true - - - if not exist "$(OutDir)" mkdir "$(OutDir)" -if exist "$(OutDir)\CocosDragonJSRes" rd /s /q "$(OutDir)\CocosDragonJSRes" -mkdir "$(OutDir)\CocosDragonJSRes" -xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\javascript\script\*.js" "$(OutDir)\CocosDragonJSRes" /e /Y -xcopy "$(ProjectDir)..\..\Shared\games\CocosDragonJS\Published files Android" "$(OutDir)\CocosDragonJSRes\" /e /Y - Copy js and resource files. - - - - - - - - - - - - - - - - - - - - {98a51ba8-fc3a-415b-ac8f-8c7bd464e93e} - - - {f8edd7fa-9a51-4e80-baeb-860825d2eac6} - - - {811c0dab-7b96-4bd3-a154-b7572b58e4ab} - - - {21070e58-eec6-4e16-8b4f-6d083df55790} - - - {f9da0fc1-651b-457b-962e-a4d61cebf5fd} - - - {625f7391-9a91-48a1-8cfc-79508c822637} - - - {68f5f371-bd7b-4c30-ae5b-0b08f22e0cde} - - - {39379840-825a-45a0-b363-c09ffef864bd} - - - {632a8f38-d0f0-4d22-86b3-d69f5e6bf63a} - - - {21b2c324-891f-48ea-ad1a-5ae13de12e28} - - - {207bc7a9-ccf1-4f2f-a04d-45f72242ae25} - - - - - - \ No newline at end of file diff --git a/samples/Javascript/CocosDragonJS/proj.win32/CocosDragonJS.vcxproj.filters b/samples/Javascript/CocosDragonJS/proj.win32/CocosDragonJS.vcxproj.filters deleted file mode 100644 index 56df37ce6f..0000000000 --- a/samples/Javascript/CocosDragonJS/proj.win32/CocosDragonJS.vcxproj.filters +++ /dev/null @@ -1,44 +0,0 @@ - - - - - {ca9c9e15-d942-43a1-aa7a-5f0b74ca1afd} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;jpg;jpeg;jpe;png;manifest - - - {ccb2323b-1cfa-41ea-bcf4-ba5f07309396} - - - {e93a77e1-af1e-4400-87d3-504b62ebdbb0} - - - - - win32 - - - Classes - - - - - win32 - - - win32 - - - Classes - - - - - resource - - - - - resource - - - \ No newline at end of file diff --git a/samples/Javascript/CocosDragonJS/proj.win32/CocosDragonJS.vcxproj.user b/samples/Javascript/CocosDragonJS/proj.win32/CocosDragonJS.vcxproj.user deleted file mode 100644 index 9d1dc0a360..0000000000 --- a/samples/Javascript/CocosDragonJS/proj.win32/CocosDragonJS.vcxproj.user +++ /dev/null @@ -1,11 +0,0 @@ - - - - $(OutDir)\CocosDragonJSRes - WindowsLocalDebugger - - - $(OutDir)\CocosDragonJSRes - WindowsLocalDebugger - - \ No newline at end of file diff --git a/samples/Javascript/CocosDragonJS/proj.win32/main.cpp b/samples/Javascript/CocosDragonJS/proj.win32/main.cpp deleted file mode 100644 index 32adc1cd52..0000000000 --- a/samples/Javascript/CocosDragonJS/proj.win32/main.cpp +++ /dev/null @@ -1,37 +0,0 @@ -#include "main.h" -#include "AppDelegate.h" -#include "CCEGLView.h" - -USING_NS_CC; - -// uncomment below line, open debug console -// #define USE_WIN32_CONSOLE - -int APIENTRY _tWinMain(HINSTANCE hInstance, - HINSTANCE hPrevInstance, - LPTSTR lpCmdLine, - int nCmdShow) -{ - UNREFERENCED_PARAMETER(hPrevInstance); - UNREFERENCED_PARAMETER(lpCmdLine); - -#ifdef USE_WIN32_CONSOLE - AllocConsole(); - freopen("CONIN$", "r", stdin); - freopen("CONOUT$", "w", stdout); - freopen("CONOUT$", "w", stderr); -#endif - - // create the application instance - AppDelegate app; - EGLView eglView; - eglView.init("CocosDragonJS", 480, 720); - - int ret = Application::getInstance()->run(); - -#ifdef USE_WIN32_CONSOLE - FreeConsole(); -#endif - - return ret; -} diff --git a/samples/Javascript/CocosDragonJS/proj.win32/main.h b/samples/Javascript/CocosDragonJS/proj.win32/main.h deleted file mode 100644 index e29aeedb3a..0000000000 --- a/samples/Javascript/CocosDragonJS/proj.win32/main.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef __MAIN_H__ -#define __MAIN_H__ - -#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers - -// Windows Header Files: -#include - -// C RunTime Header Files -#include "CCStdC.h" - -#endif // __WINMAIN_H__ diff --git a/samples/Javascript/CocosDragonJS/proj.win32/resource.h b/samples/Javascript/CocosDragonJS/proj.win32/resource.h deleted file mode 100644 index a4cfa38af8..0000000000 --- a/samples/Javascript/CocosDragonJS/proj.win32/resource.h +++ /dev/null @@ -1,20 +0,0 @@ -//{{NO_DEPENDENCIES}} -// Microsoft Visual C++ generated include file. -// Used by testjs.RC -// - -#define IDS_PROJNAME 100 -#define IDR_TESTJS 100 - -#define ID_FILE_NEW_WINDOW 32771 - -// Next default values for new objects -// -#ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 201 -#define _APS_NEXT_CONTROL_VALUE 1000 -#define _APS_NEXT_SYMED_VALUE 101 -#define _APS_NEXT_COMMAND_VALUE 32775 -#endif -#endif diff --git a/samples/Javascript/CrystalCraze/Classes/AppDelegate.cpp b/samples/Javascript/CrystalCraze/Classes/AppDelegate.cpp deleted file mode 100644 index f8cd0ab32d..0000000000 --- a/samples/Javascript/CrystalCraze/Classes/AppDelegate.cpp +++ /dev/null @@ -1,143 +0,0 @@ -#include "AppDelegate.h" - -#include "cocos2d.h" -#include "SimpleAudioEngine.h" -#include "ScriptingCore.h" -#include "jsb_cocos2dx_auto.hpp" -#include "jsb_cocos2dx_extension_auto.hpp" -#include "jsb_cocos2dx_builder_auto.hpp" -#include "extension/jsb_cocos2dx_extension_manual.h" -#include "cocos2d_specifics.hpp" -#include "cocosbuilder/js_bindings_ccbreader.h" -#include "localstorage/js_bindings_system_registration.h" -#include "chipmunk/js_bindings_chipmunk_registration.h" -#include "jsb_opengl_registration.h" - -USING_NS_CC; -using namespace CocosDenshion; - -AppDelegate::AppDelegate() -{ -} - -AppDelegate::~AppDelegate() -{ - ScriptEngineManager::destroyInstance(); -} - -bool AppDelegate::applicationDidFinishLaunching() -{ - // initialize director - auto pDirector = Director::getInstance(); - pDirector->setOpenGLView(EGLView::getInstance()); - pDirector->setProjection(Director::Projection::_2D); - - FileUtils::getInstance()->addSearchPath("script"); - - auto screenSize = EGLView::getInstance()->getFrameSize(); - - auto designSize = Size(320, 480); - auto resourceSize = Size(320, 480); - - std::vector searchPaths = FileUtils::getInstance()->getSearchPaths(); - std::vector resDirOrders; - - Application::Platform platform = Application::getInstance()->getTargetPlatform(); - if (platform == Application::Platform::OS_IPHONE || platform == Application::Platform::OS_IPAD || platform == Application::Platform::OS_MAC) - { - searchPaths.push_back("Published-iOS"); // Resources/Published-iOS - FileUtils::getInstance()->setSearchPaths(searchPaths); - - if (screenSize.height > 480) - { - resourceSize = Size(640, 960); - resDirOrders.push_back("resources-iphonehd"); - } - else - { - resDirOrders.push_back("resources-iphone"); - } - - FileUtils::getInstance()->setSearchResolutionsOrder(resDirOrders); - } - else if (platform == Application::Platform::OS_ANDROID || platform == Application::Platform::OS_WINDOWS) - { - // Comments it since opengles2.0 only supports texture size within 2048x2048. -// if (screenSize.height > 1024) -// { -// resourceSize = Size(1280, 1920); -// resDirOrders.push_back("resources-xlarge"); -// resDirOrders.push_back(""); -// } -// else - if (screenSize.height > 960) - { - resourceSize = Size(640, 960); - resDirOrders.push_back("resources-large"); - resDirOrders.push_back("resources-medium"); - resDirOrders.push_back("resources-small"); - } - else if (screenSize.height > 480) - { - resourceSize = Size(480, 720); - resDirOrders.push_back("resources-medium"); - resDirOrders.push_back("resources-small"); - } - else - { - resourceSize = Size(320, 568); - resDirOrders.push_back("resources-small"); - } - - FileUtils::getInstance()->setSearchResolutionsOrder(resDirOrders); - } - pDirector->setContentScaleFactor(resourceSize.width/designSize.width); - - EGLView::getInstance()->setDesignResolutionSize(designSize.width, designSize.height, ResolutionPolicy::SHOW_ALL); - - // turn on display FPS - pDirector->setDisplayStats(true); - - // set FPS. the default value is 1.0/60 if you don't call this - pDirector->setAnimationInterval(1.0 / 60); - - ScriptingCore* sc = ScriptingCore::getInstance(); - sc->addRegisterCallback(register_all_cocos2dx); - sc->addRegisterCallback(register_all_cocos2dx_extension); - sc->addRegisterCallback(register_cocos2dx_js_extensions); - sc->addRegisterCallback(jsb_register_chipmunk); - sc->addRegisterCallback(register_all_cocos2dx_extension_manual); - sc->addRegisterCallback(register_all_cocos2dx_builder); - sc->addRegisterCallback(register_CCBuilderReader); - sc->addRegisterCallback(jsb_register_system); - sc->addRegisterCallback(JSB_register_opengl); - - sc->start(); - -#if defined(COCOS2D_DEBUG) && (COCOS2D_DEBUG > 0) - sc->enableDebugger(); -#endif - - js_log("RUNNING Main"); - auto pEngine = ScriptingCore::getInstance(); - ScriptEngineManager::getInstance()->setScriptEngine(pEngine); - ScriptingCore::getInstance()->runScript("main.js"); - - return true; -} - -// This function will be called when the app is inactive. When comes a phone call,it's be invoked too -void AppDelegate::applicationDidEnterBackground() -{ - Director::getInstance()->stopAnimation(); - SimpleAudioEngine::getInstance()->pauseBackgroundMusic(); - SimpleAudioEngine::getInstance()->pauseAllEffects(); -} - -// this function will be called when the app is active again -void AppDelegate::applicationWillEnterForeground() -{ - Director::getInstance()->startAnimation(); - SimpleAudioEngine::getInstance()->resumeBackgroundMusic(); - SimpleAudioEngine::getInstance()->resumeAllEffects(); -} diff --git a/samples/Javascript/CrystalCraze/Classes/AppDelegate.h b/samples/Javascript/CrystalCraze/Classes/AppDelegate.h deleted file mode 100644 index df8f12f70f..0000000000 --- a/samples/Javascript/CrystalCraze/Classes/AppDelegate.h +++ /dev/null @@ -1,45 +0,0 @@ -// -// GCTestAppDelegate.h -// GCTest -// -// Created by Rohan Kuruvilla on 06/08/2012. -// Copyright __MyCompanyName__ 2012. All rights reserved. -// - -#ifndef _APP_DELEGATE_H_ -#define _APP_DELEGATE_H_ - -#include "CCApplication.h" -/** - @brief The cocos2d Application. - - The reason for implement as private inheritance is to hide some interface call by Director. - */ -class AppDelegate : private cocos2d::Application -{ -public: - AppDelegate(); - virtual ~AppDelegate(); - - /** - @brief Implement Director and Scene init code here. - @return true Initialize success, app continue. - @return false Initialize failed, app terminate. - */ - virtual bool applicationDidFinishLaunching(); - - /** - @brief The function be called when the application enter background - @param the pointer of the application - */ - virtual void applicationDidEnterBackground(); - - /** - @brief The function be called when the application enter foreground - @param the pointer of the application - */ - virtual void applicationWillEnterForeground(); -}; - -#endif // _APP_DELEGATE_H_ - diff --git a/samples/Javascript/CrystalCraze/proj.android/.classpath b/samples/Javascript/CrystalCraze/proj.android/.classpath deleted file mode 100644 index 0b08408342..0000000000 --- a/samples/Javascript/CrystalCraze/proj.android/.classpath +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/samples/Javascript/CrystalCraze/proj.android/.project b/samples/Javascript/CrystalCraze/proj.android/.project deleted file mode 100644 index 48f68239f6..0000000000 --- a/samples/Javascript/CrystalCraze/proj.android/.project +++ /dev/null @@ -1,70 +0,0 @@ - - - CrystalCraze - - - - - - com.android.ide.eclipse.adt.ResourceManagerBuilder - - - - - com.android.ide.eclipse.adt.PreCompilerBuilder - - - - - org.eclipse.jdt.core.javabuilder - - - - - com.android.ide.eclipse.adt.ApkBuilder - - - - - org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder - full,incremental, - - - - - - com.android.ide.eclipse.adt.AndroidNature - org.eclipse.jdt.core.javanature - org.eclipse.cdt.core.cnature - org.eclipse.cdt.core.ccnature - org.eclipse.cdt.managedbuilder.core.managedBuildNature - org.eclipse.cdt.managedbuilder.core.ScannerConfigNature - - - - Classes - 2 - COCOS2DX/samples/Javascript/CrystalCraze/Classes - - - cocos2dx - 2 - COCOS2DX/cocos2dx - - - cocosdenshion - 2 - COCOS2DX/CocosDenshion - - - extensions - 2 - COCOS2DX/extensions - - - scripting - 2 - COCOS2DX/scripting - - - diff --git a/samples/Javascript/CrystalCraze/proj.android/.settings/org.eclipse.cdt.codan.core.prefs b/samples/Javascript/CrystalCraze/proj.android/.settings/org.eclipse.cdt.codan.core.prefs deleted file mode 100644 index bad4196993..0000000000 --- a/samples/Javascript/CrystalCraze/proj.android/.settings/org.eclipse.cdt.codan.core.prefs +++ /dev/null @@ -1,68 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.cdt.codan.checkers.errnoreturn=-Warning -org.eclipse.cdt.codan.checkers.errnoreturn.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},implicit\=>false} -org.eclipse.cdt.codan.checkers.errreturnvalue=-Error -org.eclipse.cdt.codan.checkers.errreturnvalue.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.checkers.noreturn=-Error -org.eclipse.cdt.codan.checkers.noreturn.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},implicit\=>false} -org.eclipse.cdt.codan.internal.checkers.AbstractClassCreation=-Error -org.eclipse.cdt.codan.internal.checkers.AbstractClassCreation.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.AmbiguousProblem=-Error -org.eclipse.cdt.codan.internal.checkers.AmbiguousProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.AssignmentInConditionProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.AssignmentInConditionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.AssignmentToItselfProblem=-Error -org.eclipse.cdt.codan.internal.checkers.AssignmentToItselfProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.CaseBreakProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.CaseBreakProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},no_break_comment\=>"no break",last_case_param\=>true,empty_case_param\=>false} -org.eclipse.cdt.codan.internal.checkers.CatchByReference=-Warning -org.eclipse.cdt.codan.internal.checkers.CatchByReference.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},unknown\=>false,exceptions\=>()} -org.eclipse.cdt.codan.internal.checkers.CircularReferenceProblem=-Error -org.eclipse.cdt.codan.internal.checkers.CircularReferenceProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.ClassMembersInitialization=-Warning -org.eclipse.cdt.codan.internal.checkers.ClassMembersInitialization.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},skip\=>true} -org.eclipse.cdt.codan.internal.checkers.FieldResolutionProblem=-Error -org.eclipse.cdt.codan.internal.checkers.FieldResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.FunctionResolutionProblem=-Error -org.eclipse.cdt.codan.internal.checkers.FunctionResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.InvalidArguments=-Error -org.eclipse.cdt.codan.internal.checkers.InvalidArguments.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.InvalidTemplateArgumentsProblem=-Error -org.eclipse.cdt.codan.internal.checkers.InvalidTemplateArgumentsProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.LabelStatementNotFoundProblem=-Error -org.eclipse.cdt.codan.internal.checkers.LabelStatementNotFoundProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.MemberDeclarationNotFoundProblem=-Error -org.eclipse.cdt.codan.internal.checkers.MemberDeclarationNotFoundProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.MethodResolutionProblem=-Error -org.eclipse.cdt.codan.internal.checkers.MethodResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.NamingConventionFunctionChecker=-Info -org.eclipse.cdt.codan.internal.checkers.NamingConventionFunctionChecker.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},pattern\=>"^[a-z]",macro\=>true,exceptions\=>()} -org.eclipse.cdt.codan.internal.checkers.NonVirtualDestructorProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.NonVirtualDestructorProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.OverloadProblem=-Error -org.eclipse.cdt.codan.internal.checkers.OverloadProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.RedeclarationProblem=-Error -org.eclipse.cdt.codan.internal.checkers.RedeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.RedefinitionProblem=-Error -org.eclipse.cdt.codan.internal.checkers.RedefinitionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.ReturnStyleProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.ReturnStyleProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.ScanfFormatStringSecurityProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.ScanfFormatStringSecurityProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.StatementHasNoEffectProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.StatementHasNoEffectProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true,exceptions\=>()} -org.eclipse.cdt.codan.internal.checkers.SuggestedParenthesisProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.SuggestedParenthesisProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},paramNot\=>false} -org.eclipse.cdt.codan.internal.checkers.SuspiciousSemicolonProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.SuspiciousSemicolonProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},else\=>false,afterelse\=>false} -org.eclipse.cdt.codan.internal.checkers.TypeResolutionProblem=-Error -org.eclipse.cdt.codan.internal.checkers.TypeResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.UnusedFunctionDeclarationProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.UnusedFunctionDeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true} -org.eclipse.cdt.codan.internal.checkers.UnusedStaticFunctionProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.UnusedStaticFunctionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true} -org.eclipse.cdt.codan.internal.checkers.UnusedVariableDeclarationProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.UnusedVariableDeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true,exceptions\=>("@(\#)","$Id")} -org.eclipse.cdt.codan.internal.checkers.VariableResolutionProblem=-Error -org.eclipse.cdt.codan.internal.checkers.VariableResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -useParentScope=false diff --git a/samples/Javascript/CrystalCraze/proj.android/AndroidManifest.xml b/samples/Javascript/CrystalCraze/proj.android/AndroidManifest.xml deleted file mode 100644 index 25c83ab747..0000000000 --- a/samples/Javascript/CrystalCraze/proj.android/AndroidManifest.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/samples/Javascript/CrystalCraze/proj.android/README.md b/samples/Javascript/CrystalCraze/proj.android/README.md deleted file mode 100644 index 312835611a..0000000000 --- a/samples/Javascript/CrystalCraze/proj.android/README.md +++ /dev/null @@ -1,87 +0,0 @@ -## Prerequisites: - -* Android NDK -* Android SDK **OR** Eclipse ADT Bundle -* Android AVD target installed - -## Building project - -There are two ways of building Android projects. - -1. Eclipse -2. Command Line - -### Import Project in Eclipse - -#### Features: - -1. Complete workflow from Eclipse, including: - * Build C++. - * Clean C++. - * Build and Run whole project. - * Logcat view. - * Debug Java code. - * Javascript editor. - * Project management. -2. True C++ editing, including: - * Code completion. - * Jump to definition. - * Refactoring tools etc. - * Quick open C++ files. - - -#### Setup Eclipse Environment (only once) - - -**NOTE:** This step needs to be done only once to setup the Eclipse environment for cocos2d-x projects. Skip this section if you've done this before. - -1. Download Eclipse ADT bundle from [Google ADT homepage](http://developer.android.com/sdk/index.html) - - **OR** - - Install Eclipse with Java. Add ADT and CDT plugins. - -2. Only for Windows - 1. Install [Cygwin](http://www.cygwin.com/) with make (select make package from the list during the install). - 2. Add `Cygwin\bin` directory to system PATH variable. - 3. Add this line `none /cygdrive cygdrive binary,noacl,posix=0,user 0 0` to `Cygwin\etc\fstab` file. - -3. Set up Variables: - 1. Path Variable `COCOS2DX`: - * Eclipse->Preferences->General->Workspace->**Linked Resources** - * Click **New** button to add a Path Variable `COCOS2DX` pointing to the root cocos2d-x directory. - ![Example](https://lh5.googleusercontent.com/-oPpk9kg3e5w/UUOYlq8n7aI/AAAAAAAAsdQ/zLA4eghBH9U/s400/cocos2d-x-eclipse-vars.png) - - 2. C/C++ Environment Variable `NDK_ROOT`: - * Eclipse->Preferences->C/C++->Build->**Environment**. - * Click **Add** button and add a new variable `NDK_ROOT` pointing to the root NDK directory. - ![Example](https://lh3.googleusercontent.com/-AVcY8IAT0_g/UUOYltoRobI/AAAAAAAAsdM/22D2J9u3sig/s400/cocos2d-x-eclipse-ndk.png) - * Only for Windows: Add new variables **CYGWIN** with value `nodosfilewarning` and **SHELLOPTS** with value `igncr` - -4. Import libcocos2dx library project: - 1. File->New->Project->Android Project From Existing Code. - 2. Click **Browse** button and open `cocos2d-x/cocos2dx/platform/android/java` directory. - 3. Click **Finish** to add project. - -#### Adding and running from Eclipse - -![Example](https://lh3.googleusercontent.com/-SLBOu6e3QbE/UUOcOXYaGqI/AAAAAAAAsdo/tYBY2SylOSM/s288/cocos2d-x-eclipse-project-from-code.png) ![Import](https://lh5.googleusercontent.com/-XzC9Pn65USc/UUOcOTAwizI/AAAAAAAAsdk/4b6YM-oim9Y/s400/cocos2d-x-eclipse-import-project.png) - -1. File->New->Project->Android Project From Existing Code -2. **Browse** to your project directory. eg: `cocos2d-x/cocos2dx/samples/Cpp/TestCpp/proj.android/` -3. Add the project -4. Click **Run** or **Debug** to compile C++ followed by Java and to run on connected device or emulator. - - -### Running project from Command Line - - $ cd cocos2d-x/samples/Cpp/TestCpp/proj.android/ - $ export NDK_ROOT=/path/to/ndk - $ ./build_native.sh - $ ant debug install - -If the last command results in sdk.dir missing error then do: - - $ android list target - $ android update project -p . -t (id from step 6) - $ android update project -p cocos2d-x/cocos2dx/platform/android/java/ -t (id from step 6) diff --git a/samples/Javascript/CrystalCraze/proj.android/ant.properties b/samples/Javascript/CrystalCraze/proj.android/ant.properties deleted file mode 100644 index f8af38bfb4..0000000000 --- a/samples/Javascript/CrystalCraze/proj.android/ant.properties +++ /dev/null @@ -1 +0,0 @@ -aapt.ignore.assets="!*.pvr.gz:!*.gz:!.svn:!.git:.*:_*:!CVS:!thumbs.db:!picasa.ini:!*.scc:*~" diff --git a/samples/Javascript/CrystalCraze/proj.android/build.xml b/samples/Javascript/CrystalCraze/proj.android/build.xml deleted file mode 100644 index 1bb22c3efd..0000000000 --- a/samples/Javascript/CrystalCraze/proj.android/build.xml +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/samples/Javascript/CrystalCraze/proj.android/jni/Android.mk b/samples/Javascript/CrystalCraze/proj.android/jni/Android.mk deleted file mode 100644 index 9c8854568c..0000000000 --- a/samples/Javascript/CrystalCraze/proj.android/jni/Android.mk +++ /dev/null @@ -1,30 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE := crystalcraze_shared - -LOCAL_MODULE_FILENAME := libcrystalcraze - -LOCAL_SRC_FILES := crystalcraze/main.cpp \ - ../../Classes/AppDelegate.cpp - -LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../Classes - -LOCAL_WHOLE_STATIC_LIBRARIES := cocos_jsb_static -LOCAL_WHOLE_STATIC_LIBRARIES += jsb_chipmunk_static -LOCAL_WHOLE_STATIC_LIBRARIES += jsb_extension_static -LOCAL_WHOLE_STATIC_LIBRARIES += jsb_localstorage_static -LOCAL_WHOLE_STATIC_LIBRARIES += jsb_network_static -LOCAL_WHOLE_STATIC_LIBRARIES += jsb_builder_static - -LOCAL_EXPORT_CFLAGS := -DCOCOS2D_DEBUG=2 -DCOCOS2D_JAVASCRIPT - -include $(BUILD_SHARED_LIBRARY) - -$(call import-module,scripting/javascript/bindings) -$(call import-module,scripting/javascript/bindings/chipmunk) -$(call import-module,scripting/javascript/bindings/extension) -$(call import-module,scripting/javascript/bindings/localstorage) -$(call import-module,scripting/javascript/bindings/network) -$(call import-module,scripting/javascript/bindings/cocosbuilder) diff --git a/samples/Javascript/CrystalCraze/proj.android/jni/Application.mk b/samples/Javascript/CrystalCraze/proj.android/jni/Application.mk deleted file mode 100644 index 3666985a1f..0000000000 --- a/samples/Javascript/CrystalCraze/proj.android/jni/Application.mk +++ /dev/null @@ -1,6 +0,0 @@ -APP_STL := gnustl_static - -# add -Wno-literal-suffix to avoid warning: warning: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wliteral-suffix] -# in NDK_ROOT/arch-arm/usr/include/sys/cdefs_elf.h:35:28: when using ndk-r9 -APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -DCOCOS2D_DEBUG=1 -std=c++11 -Wno-literal-suffix -fsigned-char - diff --git a/samples/Javascript/CrystalCraze/proj.android/jni/crystalcraze/main.cpp b/samples/Javascript/CrystalCraze/proj.android/jni/crystalcraze/main.cpp deleted file mode 100644 index 9793beefb1..0000000000 --- a/samples/Javascript/CrystalCraze/proj.android/jni/crystalcraze/main.cpp +++ /dev/null @@ -1,16 +0,0 @@ -#include "AppDelegate.h" -#include "cocos2d.h" -#include "platform/android/jni/JniHelper.h" -#include "CCEventType.h" -#include -#include - -#define LOG_TAG "main" -#define LOGD(...) __android_log_print(ANDROID_LOG_DEBUG,LOG_TAG,__VA_ARGS__) - -using namespace cocos2d; - -void cocos_android_app_init (struct android_app* app) { - LOGD("cocos_android_app_init"); - AppDelegate *pAppDelegate = new AppDelegate(); -} diff --git a/samples/Javascript/CrystalCraze/proj.android/ndkgdb.sh b/samples/Javascript/CrystalCraze/proj.android/ndkgdb.sh deleted file mode 100755 index b62f46024e..0000000000 --- a/samples/Javascript/CrystalCraze/proj.android/ndkgdb.sh +++ /dev/null @@ -1,47 +0,0 @@ -APPNAME="CrystalCraze" -APP_ANDROID_NAME="org.cocos2dx.cocosdragonjs" - -if [ -z "${SDK_ROOT+aaa}" ]; then -# ... if SDK_ROOT is not set, use "$HOME/bin/android-sdk" - SDK_ROOT="$HOME/bin/android-sdk" -fi - -if [ -z "${NDK_ROOT+aaa}" ]; then -# ... if NDK_ROOT is not set, use "$HOME/bin/android-ndk" - NDK_ROOT="$HOME/bin/android-ndk" -fi - -if [ -z "${COCOS2DX_ROOT+aaa}" ]; then -# ... if COCOS2DX_ROOT is not set -# ... find current working directory - DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -# ... use paths relative to current directory - COCOS2DX_ROOT="$DIR/../../.." - APP_ROOT="$DIR/.." - APP_ANDROID_ROOT="$DIR" -else - APP_ROOT="$COCOS2DX_ROOT/samples/$APPNAME" - APP_ANDROID_ROOT="$COCOS2DX_ROOT/samples/$APPNAME/proj.android" -fi - -echo "NDK_ROOT = $NDK_ROOT" -echo "SDK_ROOT = $SDK_ROOT" -echo "COCOS2DX_ROOT = $COCOS2DX_ROOT" -echo "APP_ROOT = $APP_ROOT" -echo "APP_ANDROID_ROOT = $APP_ANDROID_ROOT" -echo "APP_ANDROID_NAME = $APP_ANDROID_NAME" - -echo -echo "Killing and restarting ${APP_ANDROID_NAME}" -echo - -set -x - -"${SDK_ROOT}"/platform-tools/adb shell am force-stop "${APP_ANDROID_NAME}" - -NDK_MODULE_PATH="${COCOS2DX_ROOT}":"${COCOS2DX_ROOT}"/cocos2dx/platform/third_party/android/prebuilt \ - "${NDK_ROOT}"/ndk-gdb \ - --adb="${SDK_ROOT}"/platform-tools/adb \ - --verbose \ - --start \ - --force diff --git a/samples/Javascript/CrystalCraze/proj.android/proguard-project.txt b/samples/Javascript/CrystalCraze/proj.android/proguard-project.txt deleted file mode 100644 index f2fe1559a2..0000000000 --- a/samples/Javascript/CrystalCraze/proj.android/proguard-project.txt +++ /dev/null @@ -1,20 +0,0 @@ -# To enable ProGuard in your project, edit project.properties -# to define the proguard.config property as described in that file. -# -# Add project specific ProGuard rules here. -# By default, the flags in this file are appended to flags specified -# in ${sdk.dir}/tools/proguard/proguard-android.txt -# You can edit the include path and order by changing the ProGuard -# include property in project.properties. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# Add any project specific keep options here: - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} diff --git a/samples/Javascript/CrystalCraze/proj.android/project.properties b/samples/Javascript/CrystalCraze/proj.android/project.properties deleted file mode 100644 index 0a6dc6664d..0000000000 --- a/samples/Javascript/CrystalCraze/proj.android/project.properties +++ /dev/null @@ -1,13 +0,0 @@ -# This file is automatically generated by Android Tools. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file must be checked in Version Control Systems. -# -# To customize properties used by the Ant build system use, -# "ant.properties", and override values to adapt the script to your -# project structure. - -# Project target. -target=android-10 - -android.library.reference.1=../../../../cocos/2d/platform/android/java diff --git a/samples/Javascript/CrystalCraze/proj.android/res/values/strings.xml b/samples/Javascript/CrystalCraze/proj.android/res/values/strings.xml deleted file mode 100644 index 3e26a6a118..0000000000 --- a/samples/Javascript/CrystalCraze/proj.android/res/values/strings.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - CrystalCraze - diff --git a/samples/Javascript/CrystalCraze/proj.android/src/org/cocos2dx/crystalcraze/Cocos2dxActivity.java b/samples/Javascript/CrystalCraze/proj.android/src/org/cocos2dx/crystalcraze/Cocos2dxActivity.java deleted file mode 100644 index f4dfa7e83b..0000000000 --- a/samples/Javascript/CrystalCraze/proj.android/src/org/cocos2dx/crystalcraze/Cocos2dxActivity.java +++ /dev/null @@ -1,33 +0,0 @@ -package org.cocos2dx.crystalcraze; - -import android.app.NativeActivity; -import android.graphics.PixelFormat; -import android.os.Bundle; - -public class Cocos2dxActivity extends NativeActivity { - - @Override - protected void onCreate(Bundle savedInstanceState) { - // TODO Auto-generated method stub - super.onCreate(savedInstanceState); - - //For supports translucency - - //1.change "attribs" in cocos\2d\platform\android\nativeactivity.cpp - /*const EGLint attribs[] = { - EGL_SURFACE_TYPE, EGL_WINDOW_BIT, - EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT, - //EGL_BLUE_SIZE, 5, -->delete - //EGL_GREEN_SIZE, 6, -->delete - //EGL_RED_SIZE, 5, -->delete - EGL_BUFFER_SIZE, 32, //-->new field - EGL_DEPTH_SIZE, 16, - EGL_STENCIL_SIZE, 8, - EGL_NONE - };*/ - - //2.Set the format of window - // getWindow().setFormat(PixelFormat.TRANSLUCENT); - - } -} diff --git a/samples/Javascript/CrystalCraze/proj.ios/AppController.h b/samples/Javascript/CrystalCraze/proj.ios/AppController.h deleted file mode 100644 index 10287bd13f..0000000000 --- a/samples/Javascript/CrystalCraze/proj.ios/AppController.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// testjsAppController.h -// testjs -// -// Created by Rolando Abarca on 3/19/12. -// Copyright __MyCompanyName__ 2012. All rights reserved. -// - -@class RootViewController; - -@interface AppController : NSObject { - UIWindow *window; - RootViewController *viewController; -} - -@end - diff --git a/samples/Javascript/CrystalCraze/proj.ios/AppController.mm b/samples/Javascript/CrystalCraze/proj.ios/AppController.mm deleted file mode 100644 index ca23f1b7f8..0000000000 --- a/samples/Javascript/CrystalCraze/proj.ios/AppController.mm +++ /dev/null @@ -1,119 +0,0 @@ -// -// testjsAppController.mm -// testjs -// -// Created by Rolando Abarca on 3/19/12. -// Copyright __MyCompanyName__ 2012. All rights reserved. -// -#import -#import "AppController.h" -#import "cocos2d.h" -#import "EAGLView.h" -#import "AppDelegate.h" - -#import "RootViewController.h" - -@implementation AppController - -#pragma mark - -#pragma mark Application lifecycle - -// cocos2d application instance -static AppDelegate s_sharedApplication; - -- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { - - // Override point for customization after application launch. - - // Add the view controller's view to the window and display. - window = [[UIWindow alloc] initWithFrame: [[UIScreen mainScreen] bounds]]; - CCEAGLView *__glView = [CCEAGLView viewWithFrame: [window bounds] - pixelFormat: kEAGLColorFormatRGBA8 - depthFormat: GL_DEPTH_COMPONENT16 //_OES - preserveBackbuffer: NO - sharegroup: nil - multiSampling: NO - numberOfSamples: 0 ]; - - // Use RootViewController manage CCEAGLView - viewController = [[RootViewController alloc] initWithNibName:nil bundle:nil]; - viewController.wantsFullScreenLayout = YES; - viewController.view = __glView; - - // Set RootViewController to window - if ( [[UIDevice currentDevice].systemVersion floatValue] < 6.0) - { - // warning: addSubView doesn't work on iOS6 - [window addSubview: viewController.view]; - } - else - { - // use this method on ios6 - [window setRootViewController:viewController]; - } - - [window makeKeyAndVisible]; - - [[UIApplication sharedApplication] setStatusBarHidden: YES]; - - cocos2d::Application::getInstance()->run(); - return YES; -} - - -- (void)applicationWillResignActive:(UIApplication *)application { - /* - Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state. - Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game. - */ - cocos2d::Director::getInstance()->pause(); -} - -- (void)applicationDidBecomeActive:(UIApplication *)application { - /* - Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface. - */ - cocos2d::Director::getInstance()->resume(); -} - -- (void)applicationDidEnterBackground:(UIApplication *)application { - /* - Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later. - If your application supports background execution, called instead of applicationWillTerminate: when the user quits. - */ - cocos2d::Application::getInstance()->applicationDidEnterBackground(); -} - -- (void)applicationWillEnterForeground:(UIApplication *)application { - /* - Called as part of transition from the background to the inactive state: here you can undo many of the changes made on entering the background. - */ - cocos2d::Application::getInstance()->applicationWillEnterForeground(); -} - -- (void)applicationWillTerminate:(UIApplication *)application { - /* - Called when the application is about to terminate. - See also applicationDidEnterBackground:. - */ -} - - -#pragma mark - -#pragma mark Memory management - -- (void)applicationDidReceiveMemoryWarning:(UIApplication *)application { - /* - Free up as much memory as possible by purging cached data objects that can be recreated (or reloaded from disk) later. - */ - cocos2d::Director::getInstance()->purgeCachedData(); -} - - -- (void)dealloc { - [super dealloc]; -} - - -@end - diff --git a/samples/Javascript/CrystalCraze/proj.ios/Default-568h@2x.png.REMOVED.git-id b/samples/Javascript/CrystalCraze/proj.ios/Default-568h@2x.png.REMOVED.git-id deleted file mode 100644 index 8f5838f3a8..0000000000 --- a/samples/Javascript/CrystalCraze/proj.ios/Default-568h@2x.png.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -66c6d1cead373b45218424f6a82f370897e443e4 \ No newline at end of file diff --git a/samples/Javascript/CrystalCraze/proj.ios/Default@2x.png.REMOVED.git-id b/samples/Javascript/CrystalCraze/proj.ios/Default@2x.png.REMOVED.git-id deleted file mode 100644 index 8843505b20..0000000000 --- a/samples/Javascript/CrystalCraze/proj.ios/Default@2x.png.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -84689888a14a2123d2b39f7f2f61be8c15207479 \ No newline at end of file diff --git a/samples/Javascript/CrystalCraze/proj.ios/Prefix.pch b/samples/Javascript/CrystalCraze/proj.ios/Prefix.pch deleted file mode 100644 index b056d8694a..0000000000 --- a/samples/Javascript/CrystalCraze/proj.ios/Prefix.pch +++ /dev/null @@ -1,8 +0,0 @@ -// -// Prefix header for all source files of the 'testjs' target in the 'testjs' project -// - -#ifdef __OBJC__ - #import - #import -#endif diff --git a/samples/Javascript/CrystalCraze/proj.ios/RootViewController.h b/samples/Javascript/CrystalCraze/proj.ios/RootViewController.h deleted file mode 100644 index 11dfc4bf88..0000000000 --- a/samples/Javascript/CrystalCraze/proj.ios/RootViewController.h +++ /dev/null @@ -1,33 +0,0 @@ -/**************************************************************************** - Copyright (c) 2010-2011 cocos2d-x.org - Copyright (c) 2010 Ricardo Quesada - - http://www.cocos2d-x.org - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - THE SOFTWARE. - ****************************************************************************/ - -#import - - -@interface RootViewController : UIViewController { - -} -- (BOOL)prefersStatusBarHidden; -@end diff --git a/samples/Javascript/CrystalCraze/proj.ios/RootViewController.mm b/samples/Javascript/CrystalCraze/proj.ios/RootViewController.mm deleted file mode 100644 index 8438d7a420..0000000000 --- a/samples/Javascript/CrystalCraze/proj.ios/RootViewController.mm +++ /dev/null @@ -1,79 +0,0 @@ -// -// testjsAppController.h -// testjs -// -// Created by Rolando Abarca on 3/19/12. -// Copyright __MyCompanyName__ 2012. All rights reserved. -// - -#import "RootViewController.h" - - -@implementation RootViewController - -/* - // The designated initializer. Override if you create the controller programmatically and want to perform customization that is not appropriate for viewDidLoad. -- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil { - if ((self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil])) { - // Custom initialization - } - return self; -} -*/ - -/* -// Implement loadView to create a view hierarchy programmatically, without using a nib. -- (void)loadView { -} -*/ - -/* -// Implement viewDidLoad to do additional setup after loading the view, typically from a nib. -- (void)viewDidLoad { - [super viewDidLoad]; -} - -*/ -// Override to allow orientations other than the default portrait orientation. -// This method is deprecated on ios6 -- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { - return UIInterfaceOrientationIsLandscape( interfaceOrientation ); -} - -// For ios6, use supportedInterfaceOrientations & shouldAutorotate instead -- (NSUInteger) supportedInterfaceOrientations{ -#ifdef __IPHONE_6_0 - return UIInterfaceOrientationMaskAllButUpsideDown; -#endif -} - -- (BOOL) shouldAutorotate { - return YES; -} - -//fix not hide status on ios7 -- (BOOL)prefersStatusBarHidden -{ - return YES; -} - -- (void)didReceiveMemoryWarning { - // Releases the view if it doesn't have a superview. - [super didReceiveMemoryWarning]; - - // Release any cached data, images, etc that aren't in use. -} - -- (void)viewDidUnload { - [super viewDidUnload]; - // Release any retained subviews of the main view. - // e.g. self.myOutlet = nil; -} - - -- (void)dealloc { - [super dealloc]; -} - - -@end diff --git a/samples/Javascript/CrystalCraze/proj.ios/main.m b/samples/Javascript/CrystalCraze/proj.ios/main.m deleted file mode 100644 index e3dedca28b..0000000000 --- a/samples/Javascript/CrystalCraze/proj.ios/main.m +++ /dev/null @@ -1,17 +0,0 @@ -// -// main.m -// testjs -// -// Created by Rolando Abarca on 3/19/12. -// Copyright __MyCompanyName__ 2012. All rights reserved. -// - -#import - -int main(int argc, char *argv[]) { - - NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init]; - int retVal = UIApplicationMain(argc, argv, nil, @"AppController"); - [pool release]; - return retVal; -} diff --git a/samples/Javascript/CrystalCraze/proj.mac/Icon.icns.REMOVED.git-id b/samples/Javascript/CrystalCraze/proj.mac/Icon.icns.REMOVED.git-id deleted file mode 100644 index 9874ec6979..0000000000 --- a/samples/Javascript/CrystalCraze/proj.mac/Icon.icns.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -3d09e8fb4f4ca1c1ae7ab0a6948db592c7c3d9a0 \ No newline at end of file diff --git a/samples/Javascript/CrystalCraze/proj.mac/en.lproj/InfoPlist.strings b/samples/Javascript/CrystalCraze/proj.mac/en.lproj/InfoPlist.strings deleted file mode 100644 index 477b28ff8f..0000000000 --- a/samples/Javascript/CrystalCraze/proj.mac/en.lproj/InfoPlist.strings +++ /dev/null @@ -1,2 +0,0 @@ -/* Localized versions of Info.plist keys */ - diff --git a/samples/Javascript/CrystalCraze/proj.mac/en.lproj/MainMenu.xib b/samples/Javascript/CrystalCraze/proj.mac/en.lproj/MainMenu.xib deleted file mode 100644 index 3dacdedbd0..0000000000 --- a/samples/Javascript/CrystalCraze/proj.mac/en.lproj/MainMenu.xib +++ /dev/null @@ -1,812 +0,0 @@ - - - - 1060 - 10K549 - 1938 - 1038.36 - 461.00 - - com.apple.InterfaceBuilder.CocoaPlugin - 1938 - - - YES - NSMenuItem - NSCustomObject - NSMenu - - - YES - com.apple.InterfaceBuilder.CocoaPlugin - - - PluginDependencyRecalculationVersion - - - - YES - - NSApplication - - - FirstResponder - - - NSApplication - - - AMainMenu - - YES - - - TestCpp - - 1048576 - 2147483647 - - NSImage - NSMenuCheckmark - - - NSImage - NSMenuMixedState - - submenuAction: - - TestCpp - - YES - - - About TestCpp - - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Preferences… - , - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Services - - 1048576 - 2147483647 - - - submenuAction: - - Services - - YES - - _NSServicesMenu - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Hide TestCpp - h - 1048576 - 2147483647 - - - - - - Hide Others - h - 1572864 - 2147483647 - - - - - - Show All - - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Quit TestCpp - q - 1048576 - 2147483647 - - - - - _NSAppleMenu - - - - - View - - 1048576 - 2147483647 - - - submenuAction: - - View - - YES - - - Toggle Fullscreen - f - 1048576 - 2147483647 - - - - - - - - - Window - - 1048576 - 2147483647 - - - submenuAction: - - Window - - YES - - - Minimize - m - 1048576 - 2147483647 - - - - - - Zoom - - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Bring All to Front - - 1048576 - 2147483647 - - - - - _NSWindowsMenu - - - - - Help - - 2147483647 - - - submenuAction: - - Help - - YES - - - TestCpp Help - ? - 1048576 - 2147483647 - - - - - _NSHelpMenu - - - - _NSMainMenu - - - AppController - - - NSFontManager - - - - - YES - - - terminate: - - - - 449 - - - - orderFrontStandardAboutPanel: - - - - 142 - - - - delegate - - - - 495 - - - - performMiniaturize: - - - - 37 - - - - arrangeInFront: - - - - 39 - - - - performZoom: - - - - 240 - - - - hide: - - - - 367 - - - - hideOtherApplications: - - - - 368 - - - - unhideAllApplications: - - - - 370 - - - - showHelp: - - - - 493 - - - - toggleFullScreen: - - - - 537 - - - - - YES - - 0 - - YES - - - - - - -2 - - - File's Owner - - - -1 - - - First Responder - - - -3 - - - Application - - - 29 - - - YES - - - - - - - - - 19 - - - YES - - - - - - 56 - - - YES - - - - - - 57 - - - YES - - - - - - - - - - - - - - - - 58 - - - - - 134 - - - - - 150 - - - - - 136 - - - - - 144 - - - - - 129 - - - - - 143 - - - - - 236 - - - - - 131 - - - YES - - - - - - 149 - - - - - 145 - - - - - 130 - - - - - 24 - - - YES - - - - - - - - - 92 - - - - - 5 - - - - - 239 - - - - - 23 - - - - - 295 - - - YES - - - - - - 296 - - - YES - - - - - - 420 - - - - - 490 - - - YES - - - - - - 491 - - - YES - - - - - - 492 - - - - - 494 - - - - - 536 - - - - - - - YES - - YES - -1.IBPluginDependency - -2.IBPluginDependency - -3.IBPluginDependency - 129.IBPluginDependency - 130.IBPluginDependency - 131.IBPluginDependency - 134.IBPluginDependency - 136.IBPluginDependency - 143.IBPluginDependency - 144.IBPluginDependency - 145.IBPluginDependency - 149.IBPluginDependency - 150.IBPluginDependency - 19.IBPluginDependency - 23.IBPluginDependency - 236.IBPluginDependency - 239.IBPluginDependency - 24.IBPluginDependency - 29.IBPluginDependency - 295.IBPluginDependency - 296.IBPluginDependency - 420.IBPluginDependency - 490.IBPluginDependency - 491.IBPluginDependency - 492.IBPluginDependency - 494.IBPluginDependency - 5.IBPluginDependency - 536.IBPluginDependency - 56.IBPluginDependency - 57.IBPluginDependency - 58.IBPluginDependency - 92.IBPluginDependency - - - YES - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - - - YES - - - - - - YES - - - - - 541 - - - - YES - - AppController - NSObject - - YES - - YES - exitFullScreen: - toggleFullScreen: - - - YES - id - id - - - - YES - - YES - exitFullScreen: - toggleFullScreen: - - - YES - - exitFullScreen: - id - - - toggleFullScreen: - id - - - - - YES - - YES - glView - window - - - YES - EAGLView - NSWindow - - - - YES - - YES - glView - window - - - YES - - glView - EAGLView - - - window - NSWindow - - - - - IBProjectSource - ./Classes/AppController.h - - - - EAGLView - NSOpenGLView - - IBProjectSource - ./Classes/EAGLView.h - - - - - 0 - IBCocoaFramework - - com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 - - - YES - 3 - - YES - - YES - NSMenuCheckmark - NSMenuMixedState - - - YES - {9, 8} - {7, 2} - - - - diff --git a/samples/Javascript/CrystalCraze/proj.mac/main.cpp b/samples/Javascript/CrystalCraze/proj.mac/main.cpp deleted file mode 100644 index fecfe31ab8..0000000000 --- a/samples/Javascript/CrystalCraze/proj.mac/main.cpp +++ /dev/null @@ -1,36 +0,0 @@ -/**************************************************************************** - Copyright (c) 2010 cocos2d-x.org - - http://www.cocos2d-x.org - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - THE SOFTWARE. - ****************************************************************************/ - -#include "AppDelegate.h" -#include "cocos2d.h" - -USING_NS_CC; - -int main(int argc, char *argv[]) -{ - AppDelegate app; - EGLView eglView; - eglView.init("CrystalCraze", 480, 720); - return Application::getInstance()->run(); -} diff --git a/samples/Javascript/CrystalCraze/proj.win32/CrystalCraze.vcxproj b/samples/Javascript/CrystalCraze/proj.win32/CrystalCraze.vcxproj deleted file mode 100644 index 36fd882002..0000000000 --- a/samples/Javascript/CrystalCraze/proj.win32/CrystalCraze.vcxproj +++ /dev/null @@ -1,234 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {9A17D9A4-4B11-4E32-94F6-895FF4909EC5} - CrystalCraze - - - - Application - Unicode - v100 - v110 - v110_xp - - - Application - Unicode - v100 - v110 - v110_xp - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration).win32\ - $(Configuration).win32\ - false - $(SolutionDir)$(Configuration).win32\ - $(Configuration).win32\ - false - AllRules.ruleset - - - AllRules.ruleset - - - - - $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath) - - - $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath) - - - - _DEBUG;%(PreprocessorDefinitions) - false - Win32 - true - $(IntDir)testjs.tlb - testjs.h - - - testjs_i.c - testjs_p.c - - - Disabled - $(ProjectDir)..\Classes;$(EngineRoot);$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\scripting\auto-generated\js-bindings;$(EngineRoot)cocos\scripting\javascript\bindings;$(EngineRoot)cocos\audio\include;$(EngineRoot)external\spidermonkey\include\win32;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;%(AdditionalIncludeDirectories) - WIN32;_WINDOWS;STRICT;_DEBUG;DEBUG;XP_WIN;JS_HAVE___INTN;JS_INTPTR_TYPE=int;COCOS2D_DEBUG=1;COCOS2D_JAVASCRIPT=1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - false - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - 4267;4251;4244;%(DisableSpecificWarnings) - true - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(IntDir);%(AdditionalIncludeDirectories) - - - if not exist "$(OutDir)" mkdir "$(OutDir)" -xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\spidermonkey\prebuilt\win32\*.*" "$(OutDir)" - - - - libcurl_imp.lib;mozjs-25.0.lib;ws2_32.lib;sqlite3.lib;%(AdditionalDependencies) - $(OutDir);%(AdditionalLibraryDirectories) - true - Windows - MachineX86 - - - if not exist "$(OutDir)" mkdir "$(OutDir)" -if exist "$(OutDir)\CrystalCrazeRes" rd /s /q "$(OutDir)\CrystalCrazeRes" -mkdir "$(OutDir)\CrystalCrazeRes" -xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\javascript\script\*.js" "$(OutDir)\CrystalCrazeRes" /e /Y -xcopy "$(ProjectDir)..\..\Shared\games\CrystalCraze\Published-Android" "$(OutDir)\CrystalCrazeRes\" /e /Y - - - Copy js and resource files. - - - - - NDEBUG;%(PreprocessorDefinitions) - false - Win32 - true - $(IntDir)testjs.tlb - testjs.h - - - testjs_i.c - testjs_p.c - - - $(ProjectDir)..\Classes;$(EngineRoot);$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\scripting\auto-generated\js-bindings;$(EngineRoot)cocos\scripting\javascript\bindings;$(EngineRoot)cocos\audio\include;$(EngineRoot)external\spidermonkey\include\win32;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;%(AdditionalIncludeDirectories) - WIN32;_WINDOWS;STRICT;NDEBUG;XP_WIN;JS_HAVE___INTN;JS_INTPTR_TYPE=int;CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_JAVASCRIPT=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - - - MultiThreadedDLL - - - Level3 - - - 4267;4251;4244;%(DisableSpecificWarnings) - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(IntDir);%(AdditionalIncludeDirectories) - - - if not exist "$(OutDir)" mkdir "$(OutDir)" -xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\spidermonkey\prebuilt\win32\*.*" "$(OutDir)" - - - - libcurl_imp.lib;mozjs-25.0.lib;ws2_32.lib;sqlite3.lib;%(AdditionalDependencies) - $(OutDir);%(AdditionalLibraryDirectories) - Windows - MachineX86 - true - - - if not exist "$(OutDir)" mkdir "$(OutDir)" -if exist "$(OutDir)\CrystalCrazeRes" rd /s /q "$(OutDir)\CrystalCrazeRes" -mkdir "$(OutDir)\CrystalCrazeRes" -xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\javascript\script\*.js" "$(OutDir)\CrystalCrazeRes" /e /Y -xcopy "$(ProjectDir)..\..\Shared\games\CrystalCraze\Published-Android" "$(OutDir)\CrystalCrazeRes\" /e /Y - Copy js and resource files. - - - - - - - - - - - - - - - - - - - - {98a51ba8-fc3a-415b-ac8f-8c7bd464e93e} - - - {f8edd7fa-9a51-4e80-baeb-860825d2eac6} - - - {811c0dab-7b96-4bd3-a154-b7572b58e4ab} - - - {b57cf53f-2e49-4031-9822-047cc0e6bde2} - - - {df2638c0-8128-4847-867c-6eafe3dee7b5} - - - {21070e58-eec6-4e16-8b4f-6d083df55790} - - - {f9da0fc1-651b-457b-962e-a4d61cebf5fd} - - - {625f7391-9a91-48a1-8cfc-79508c822637} - - - {68f5f371-bd7b-4c30-ae5b-0b08f22e0cde} - - - {39379840-825a-45a0-b363-c09ffef864bd} - - - {632a8f38-d0f0-4d22-86b3-d69f5e6bf63a} - - - {21b2c324-891f-48ea-ad1a-5ae13de12e28} - - - {207bc7a9-ccf1-4f2f-a04d-45f72242ae25} - - - - - - \ No newline at end of file diff --git a/samples/Javascript/CrystalCraze/proj.win32/CrystalCraze.vcxproj.filters b/samples/Javascript/CrystalCraze/proj.win32/CrystalCraze.vcxproj.filters deleted file mode 100644 index 56df37ce6f..0000000000 --- a/samples/Javascript/CrystalCraze/proj.win32/CrystalCraze.vcxproj.filters +++ /dev/null @@ -1,44 +0,0 @@ - - - - - {ca9c9e15-d942-43a1-aa7a-5f0b74ca1afd} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;jpg;jpeg;jpe;png;manifest - - - {ccb2323b-1cfa-41ea-bcf4-ba5f07309396} - - - {e93a77e1-af1e-4400-87d3-504b62ebdbb0} - - - - - win32 - - - Classes - - - - - win32 - - - win32 - - - Classes - - - - - resource - - - - - resource - - - \ No newline at end of file diff --git a/samples/Javascript/CrystalCraze/proj.win32/CrystalCraze.vcxproj.user b/samples/Javascript/CrystalCraze/proj.win32/CrystalCraze.vcxproj.user deleted file mode 100644 index 17116bfa9e..0000000000 --- a/samples/Javascript/CrystalCraze/proj.win32/CrystalCraze.vcxproj.user +++ /dev/null @@ -1,11 +0,0 @@ - - - - $(OutDir)\CrystalCrazeRes - WindowsLocalDebugger - - - $(OutDir)\CrystalCrazeRes - WindowsLocalDebugger - - \ No newline at end of file diff --git a/samples/Javascript/CrystalCraze/proj.win32/main.cpp b/samples/Javascript/CrystalCraze/proj.win32/main.cpp deleted file mode 100644 index 6064ff7dd8..0000000000 --- a/samples/Javascript/CrystalCraze/proj.win32/main.cpp +++ /dev/null @@ -1,37 +0,0 @@ -#include "main.h" -#include "AppDelegate.h" -#include "CCEGLView.h" - -USING_NS_CC; - -// uncomment below line, open debug console -// #define USE_WIN32_CONSOLE - -int APIENTRY _tWinMain(HINSTANCE hInstance, - HINSTANCE hPrevInstance, - LPTSTR lpCmdLine, - int nCmdShow) -{ - UNREFERENCED_PARAMETER(hPrevInstance); - UNREFERENCED_PARAMETER(lpCmdLine); - -#ifdef USE_WIN32_CONSOLE - AllocConsole(); - freopen("CONIN$", "r", stdin); - freopen("CONOUT$", "w", stdout); - freopen("CONOUT$", "w", stderr); -#endif - - // create the application instance - AppDelegate app; - EGLView eglView; - eglView.init("CrystalCraze", 480, 720); - - int ret = Application::getInstance()->run(); - -#ifdef USE_WIN32_CONSOLE - FreeConsole(); -#endif - - return ret; -} diff --git a/samples/Javascript/CrystalCraze/proj.win32/main.h b/samples/Javascript/CrystalCraze/proj.win32/main.h deleted file mode 100644 index e29aeedb3a..0000000000 --- a/samples/Javascript/CrystalCraze/proj.win32/main.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef __MAIN_H__ -#define __MAIN_H__ - -#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers - -// Windows Header Files: -#include - -// C RunTime Header Files -#include "CCStdC.h" - -#endif // __WINMAIN_H__ diff --git a/samples/Javascript/CrystalCraze/proj.win32/res/testjs.ico b/samples/Javascript/CrystalCraze/proj.win32/res/testjs.ico deleted file mode 100644 index feaf932a7465e435af6271bd8204c0145731a6eb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 47629 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::getInstance()); - pDirector->setProjection(Director::Projection::_2D); - - // Set the design resolution - EGLView::getInstance()->setDesignResolutionSize(320, 480, ResolutionPolicy::SHOW_ALL); - - // turn on display FPS - pDirector->setDisplayStats(true); - - // set FPS. the default value is 1.0/60 if you don't call this - pDirector->setAnimationInterval(1.0 / 60); - - FileUtils::getInstance()->addSearchPath("script"); - - ScriptingCore* sc = ScriptingCore::getInstance(); - sc->addRegisterCallback(register_all_cocos2dx); - sc->addRegisterCallback(register_all_cocos2dx_extension); - sc->addRegisterCallback(register_cocos2dx_js_extensions); - sc->addRegisterCallback(jsb_register_chipmunk); - sc->addRegisterCallback(register_all_cocos2dx_extension_manual); - sc->addRegisterCallback(register_all_cocos2dx_builder); - sc->addRegisterCallback(register_CCBuilderReader); - sc->addRegisterCallback(jsb_register_system); - sc->addRegisterCallback(JSB_register_opengl); - - sc->start(); - -#if defined(COCOS2D_DEBUG) && (COCOS2D_DEBUG > 0) - sc->enableDebugger(); -#endif - - auto pEngine = ScriptingCore::getInstance(); - ScriptEngineManager::getInstance()->setScriptEngine(pEngine); - - ScriptingCore::getInstance()->runScript("MoonWarriors-jsb.js"); - - return true; -} - -// This function will be called when the app is inactive. When comes a phone call,it's be invoked too -void AppDelegate::applicationDidEnterBackground() -{ - Director::getInstance()->stopAnimation(); - SimpleAudioEngine::getInstance()->pauseBackgroundMusic(); - SimpleAudioEngine::getInstance()->pauseAllEffects(); -} - -// this function will be called when the app is active again -void AppDelegate::applicationWillEnterForeground() -{ - Director::getInstance()->startAnimation(); - SimpleAudioEngine::getInstance()->resumeBackgroundMusic(); - SimpleAudioEngine::getInstance()->resumeAllEffects(); -} diff --git a/samples/Javascript/MoonWarriors/Classes/AppDelegate.h b/samples/Javascript/MoonWarriors/Classes/AppDelegate.h deleted file mode 100644 index df8f12f70f..0000000000 --- a/samples/Javascript/MoonWarriors/Classes/AppDelegate.h +++ /dev/null @@ -1,45 +0,0 @@ -// -// GCTestAppDelegate.h -// GCTest -// -// Created by Rohan Kuruvilla on 06/08/2012. -// Copyright __MyCompanyName__ 2012. All rights reserved. -// - -#ifndef _APP_DELEGATE_H_ -#define _APP_DELEGATE_H_ - -#include "CCApplication.h" -/** - @brief The cocos2d Application. - - The reason for implement as private inheritance is to hide some interface call by Director. - */ -class AppDelegate : private cocos2d::Application -{ -public: - AppDelegate(); - virtual ~AppDelegate(); - - /** - @brief Implement Director and Scene init code here. - @return true Initialize success, app continue. - @return false Initialize failed, app terminate. - */ - virtual bool applicationDidFinishLaunching(); - - /** - @brief The function be called when the application enter background - @param the pointer of the application - */ - virtual void applicationDidEnterBackground(); - - /** - @brief The function be called when the application enter foreground - @param the pointer of the application - */ - virtual void applicationWillEnterForeground(); -}; - -#endif // _APP_DELEGATE_H_ - diff --git a/samples/Javascript/MoonWarriors/proj.android/.classpath b/samples/Javascript/MoonWarriors/proj.android/.classpath deleted file mode 100644 index 0b08408342..0000000000 --- a/samples/Javascript/MoonWarriors/proj.android/.classpath +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/samples/Javascript/MoonWarriors/proj.android/.project b/samples/Javascript/MoonWarriors/proj.android/.project deleted file mode 100644 index 4bdf70520e..0000000000 --- a/samples/Javascript/MoonWarriors/proj.android/.project +++ /dev/null @@ -1,70 +0,0 @@ - - - MoonWarriors - - - - - - com.android.ide.eclipse.adt.ResourceManagerBuilder - - - - - com.android.ide.eclipse.adt.PreCompilerBuilder - - - - - org.eclipse.jdt.core.javabuilder - - - - - com.android.ide.eclipse.adt.ApkBuilder - - - - - org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder - full,incremental, - - - - - - com.android.ide.eclipse.adt.AndroidNature - org.eclipse.jdt.core.javanature - org.eclipse.cdt.core.cnature - org.eclipse.cdt.core.ccnature - org.eclipse.cdt.managedbuilder.core.managedBuildNature - org.eclipse.cdt.managedbuilder.core.ScannerConfigNature - - - - Classes - 2 - COCOS2DX/samples/Javascript/MoonWarriors/Classes - - - cocos2dx - 2 - COCOS2DX/cocos2dx - - - cocosdenshion - 2 - COCOS2DX/CocosDenshion - - - extensions - 2 - COCOS2DX/extensions - - - scripting - 2 - COCOS2DX/scripting - - - diff --git a/samples/Javascript/MoonWarriors/proj.android/.settings/org.eclipse.cdt.codan.core.prefs b/samples/Javascript/MoonWarriors/proj.android/.settings/org.eclipse.cdt.codan.core.prefs deleted file mode 100644 index bad4196993..0000000000 --- a/samples/Javascript/MoonWarriors/proj.android/.settings/org.eclipse.cdt.codan.core.prefs +++ /dev/null @@ -1,68 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.cdt.codan.checkers.errnoreturn=-Warning -org.eclipse.cdt.codan.checkers.errnoreturn.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},implicit\=>false} -org.eclipse.cdt.codan.checkers.errreturnvalue=-Error -org.eclipse.cdt.codan.checkers.errreturnvalue.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.checkers.noreturn=-Error -org.eclipse.cdt.codan.checkers.noreturn.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},implicit\=>false} -org.eclipse.cdt.codan.internal.checkers.AbstractClassCreation=-Error -org.eclipse.cdt.codan.internal.checkers.AbstractClassCreation.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.AmbiguousProblem=-Error -org.eclipse.cdt.codan.internal.checkers.AmbiguousProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.AssignmentInConditionProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.AssignmentInConditionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.AssignmentToItselfProblem=-Error -org.eclipse.cdt.codan.internal.checkers.AssignmentToItselfProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.CaseBreakProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.CaseBreakProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},no_break_comment\=>"no break",last_case_param\=>true,empty_case_param\=>false} -org.eclipse.cdt.codan.internal.checkers.CatchByReference=-Warning -org.eclipse.cdt.codan.internal.checkers.CatchByReference.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},unknown\=>false,exceptions\=>()} -org.eclipse.cdt.codan.internal.checkers.CircularReferenceProblem=-Error -org.eclipse.cdt.codan.internal.checkers.CircularReferenceProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.ClassMembersInitialization=-Warning -org.eclipse.cdt.codan.internal.checkers.ClassMembersInitialization.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},skip\=>true} -org.eclipse.cdt.codan.internal.checkers.FieldResolutionProblem=-Error -org.eclipse.cdt.codan.internal.checkers.FieldResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.FunctionResolutionProblem=-Error -org.eclipse.cdt.codan.internal.checkers.FunctionResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.InvalidArguments=-Error -org.eclipse.cdt.codan.internal.checkers.InvalidArguments.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.InvalidTemplateArgumentsProblem=-Error -org.eclipse.cdt.codan.internal.checkers.InvalidTemplateArgumentsProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.LabelStatementNotFoundProblem=-Error -org.eclipse.cdt.codan.internal.checkers.LabelStatementNotFoundProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.MemberDeclarationNotFoundProblem=-Error -org.eclipse.cdt.codan.internal.checkers.MemberDeclarationNotFoundProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.MethodResolutionProblem=-Error -org.eclipse.cdt.codan.internal.checkers.MethodResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.NamingConventionFunctionChecker=-Info -org.eclipse.cdt.codan.internal.checkers.NamingConventionFunctionChecker.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},pattern\=>"^[a-z]",macro\=>true,exceptions\=>()} -org.eclipse.cdt.codan.internal.checkers.NonVirtualDestructorProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.NonVirtualDestructorProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.OverloadProblem=-Error -org.eclipse.cdt.codan.internal.checkers.OverloadProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.RedeclarationProblem=-Error -org.eclipse.cdt.codan.internal.checkers.RedeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.RedefinitionProblem=-Error -org.eclipse.cdt.codan.internal.checkers.RedefinitionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.ReturnStyleProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.ReturnStyleProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.ScanfFormatStringSecurityProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.ScanfFormatStringSecurityProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.StatementHasNoEffectProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.StatementHasNoEffectProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true,exceptions\=>()} -org.eclipse.cdt.codan.internal.checkers.SuggestedParenthesisProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.SuggestedParenthesisProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},paramNot\=>false} -org.eclipse.cdt.codan.internal.checkers.SuspiciousSemicolonProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.SuspiciousSemicolonProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},else\=>false,afterelse\=>false} -org.eclipse.cdt.codan.internal.checkers.TypeResolutionProblem=-Error -org.eclipse.cdt.codan.internal.checkers.TypeResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.UnusedFunctionDeclarationProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.UnusedFunctionDeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true} -org.eclipse.cdt.codan.internal.checkers.UnusedStaticFunctionProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.UnusedStaticFunctionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true} -org.eclipse.cdt.codan.internal.checkers.UnusedVariableDeclarationProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.UnusedVariableDeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true,exceptions\=>("@(\#)","$Id")} -org.eclipse.cdt.codan.internal.checkers.VariableResolutionProblem=-Error -org.eclipse.cdt.codan.internal.checkers.VariableResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -useParentScope=false diff --git a/samples/Javascript/MoonWarriors/proj.android/AndroidManifest.xml b/samples/Javascript/MoonWarriors/proj.android/AndroidManifest.xml deleted file mode 100644 index 0ba17d3e4a..0000000000 --- a/samples/Javascript/MoonWarriors/proj.android/AndroidManifest.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/samples/Javascript/MoonWarriors/proj.android/README.md b/samples/Javascript/MoonWarriors/proj.android/README.md deleted file mode 100644 index 312835611a..0000000000 --- a/samples/Javascript/MoonWarriors/proj.android/README.md +++ /dev/null @@ -1,87 +0,0 @@ -## Prerequisites: - -* Android NDK -* Android SDK **OR** Eclipse ADT Bundle -* Android AVD target installed - -## Building project - -There are two ways of building Android projects. - -1. Eclipse -2. Command Line - -### Import Project in Eclipse - -#### Features: - -1. Complete workflow from Eclipse, including: - * Build C++. - * Clean C++. - * Build and Run whole project. - * Logcat view. - * Debug Java code. - * Javascript editor. - * Project management. -2. True C++ editing, including: - * Code completion. - * Jump to definition. - * Refactoring tools etc. - * Quick open C++ files. - - -#### Setup Eclipse Environment (only once) - - -**NOTE:** This step needs to be done only once to setup the Eclipse environment for cocos2d-x projects. Skip this section if you've done this before. - -1. Download Eclipse ADT bundle from [Google ADT homepage](http://developer.android.com/sdk/index.html) - - **OR** - - Install Eclipse with Java. Add ADT and CDT plugins. - -2. Only for Windows - 1. Install [Cygwin](http://www.cygwin.com/) with make (select make package from the list during the install). - 2. Add `Cygwin\bin` directory to system PATH variable. - 3. Add this line `none /cygdrive cygdrive binary,noacl,posix=0,user 0 0` to `Cygwin\etc\fstab` file. - -3. Set up Variables: - 1. Path Variable `COCOS2DX`: - * Eclipse->Preferences->General->Workspace->**Linked Resources** - * Click **New** button to add a Path Variable `COCOS2DX` pointing to the root cocos2d-x directory. - ![Example](https://lh5.googleusercontent.com/-oPpk9kg3e5w/UUOYlq8n7aI/AAAAAAAAsdQ/zLA4eghBH9U/s400/cocos2d-x-eclipse-vars.png) - - 2. C/C++ Environment Variable `NDK_ROOT`: - * Eclipse->Preferences->C/C++->Build->**Environment**. - * Click **Add** button and add a new variable `NDK_ROOT` pointing to the root NDK directory. - ![Example](https://lh3.googleusercontent.com/-AVcY8IAT0_g/UUOYltoRobI/AAAAAAAAsdM/22D2J9u3sig/s400/cocos2d-x-eclipse-ndk.png) - * Only for Windows: Add new variables **CYGWIN** with value `nodosfilewarning` and **SHELLOPTS** with value `igncr` - -4. Import libcocos2dx library project: - 1. File->New->Project->Android Project From Existing Code. - 2. Click **Browse** button and open `cocos2d-x/cocos2dx/platform/android/java` directory. - 3. Click **Finish** to add project. - -#### Adding and running from Eclipse - -![Example](https://lh3.googleusercontent.com/-SLBOu6e3QbE/UUOcOXYaGqI/AAAAAAAAsdo/tYBY2SylOSM/s288/cocos2d-x-eclipse-project-from-code.png) ![Import](https://lh5.googleusercontent.com/-XzC9Pn65USc/UUOcOTAwizI/AAAAAAAAsdk/4b6YM-oim9Y/s400/cocos2d-x-eclipse-import-project.png) - -1. File->New->Project->Android Project From Existing Code -2. **Browse** to your project directory. eg: `cocos2d-x/cocos2dx/samples/Cpp/TestCpp/proj.android/` -3. Add the project -4. Click **Run** or **Debug** to compile C++ followed by Java and to run on connected device or emulator. - - -### Running project from Command Line - - $ cd cocos2d-x/samples/Cpp/TestCpp/proj.android/ - $ export NDK_ROOT=/path/to/ndk - $ ./build_native.sh - $ ant debug install - -If the last command results in sdk.dir missing error then do: - - $ android list target - $ android update project -p . -t (id from step 6) - $ android update project -p cocos2d-x/cocos2dx/platform/android/java/ -t (id from step 6) diff --git a/samples/Javascript/MoonWarriors/proj.android/ant.properties b/samples/Javascript/MoonWarriors/proj.android/ant.properties deleted file mode 100644 index f8af38bfb4..0000000000 --- a/samples/Javascript/MoonWarriors/proj.android/ant.properties +++ /dev/null @@ -1 +0,0 @@ -aapt.ignore.assets="!*.pvr.gz:!*.gz:!.svn:!.git:.*:_*:!CVS:!thumbs.db:!picasa.ini:!*.scc:*~" diff --git a/samples/Javascript/MoonWarriors/proj.android/build.xml b/samples/Javascript/MoonWarriors/proj.android/build.xml deleted file mode 100644 index ae419c802d..0000000000 --- a/samples/Javascript/MoonWarriors/proj.android/build.xml +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/samples/Javascript/MoonWarriors/proj.android/jni/Android.mk b/samples/Javascript/MoonWarriors/proj.android/jni/Android.mk deleted file mode 100644 index 93726f5b70..0000000000 --- a/samples/Javascript/MoonWarriors/proj.android/jni/Android.mk +++ /dev/null @@ -1,30 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE := moonwarriors_shared - -LOCAL_MODULE_FILENAME := libmoonwarriors - -LOCAL_SRC_FILES := moonwarriors/main.cpp \ - ../../Classes/AppDelegate.cpp - -LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../Classes - -LOCAL_WHOLE_STATIC_LIBRARIES := cocos_jsb_static -LOCAL_WHOLE_STATIC_LIBRARIES += jsb_chipmunk_static -LOCAL_WHOLE_STATIC_LIBRARIES += jsb_extension_static -LOCAL_WHOLE_STATIC_LIBRARIES += jsb_localstorage_static -LOCAL_WHOLE_STATIC_LIBRARIES += jsb_network_static -LOCAL_WHOLE_STATIC_LIBRARIES += jsb_builder_static - -LOCAL_EXPORT_CFLAGS := -DCOCOS2D_DEBUG=2 -DCOCOS2D_JAVASCRIPT - -include $(BUILD_SHARED_LIBRARY) - -$(call import-module,scripting/javascript/bindings) -$(call import-module,scripting/javascript/bindings/chipmunk) -$(call import-module,scripting/javascript/bindings/extension) -$(call import-module,scripting/javascript/bindings/localstorage) -$(call import-module,scripting/javascript/bindings/network) -$(call import-module,scripting/javascript/bindings/cocosbuilder) diff --git a/samples/Javascript/MoonWarriors/proj.android/jni/moonwarriors/main.cpp b/samples/Javascript/MoonWarriors/proj.android/jni/moonwarriors/main.cpp deleted file mode 100644 index 9793beefb1..0000000000 --- a/samples/Javascript/MoonWarriors/proj.android/jni/moonwarriors/main.cpp +++ /dev/null @@ -1,16 +0,0 @@ -#include "AppDelegate.h" -#include "cocos2d.h" -#include "platform/android/jni/JniHelper.h" -#include "CCEventType.h" -#include -#include - -#define LOG_TAG "main" -#define LOGD(...) __android_log_print(ANDROID_LOG_DEBUG,LOG_TAG,__VA_ARGS__) - -using namespace cocos2d; - -void cocos_android_app_init (struct android_app* app) { - LOGD("cocos_android_app_init"); - AppDelegate *pAppDelegate = new AppDelegate(); -} diff --git a/samples/Javascript/MoonWarriors/proj.android/proguard-project.txt b/samples/Javascript/MoonWarriors/proj.android/proguard-project.txt deleted file mode 100644 index f2fe1559a2..0000000000 --- a/samples/Javascript/MoonWarriors/proj.android/proguard-project.txt +++ /dev/null @@ -1,20 +0,0 @@ -# To enable ProGuard in your project, edit project.properties -# to define the proguard.config property as described in that file. -# -# Add project specific ProGuard rules here. -# By default, the flags in this file are appended to flags specified -# in ${sdk.dir}/tools/proguard/proguard-android.txt -# You can edit the include path and order by changing the ProGuard -# include property in project.properties. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# Add any project specific keep options here: - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} diff --git a/samples/Javascript/MoonWarriors/proj.android/project.properties b/samples/Javascript/MoonWarriors/proj.android/project.properties deleted file mode 100644 index 0a6dc6664d..0000000000 --- a/samples/Javascript/MoonWarriors/proj.android/project.properties +++ /dev/null @@ -1,13 +0,0 @@ -# This file is automatically generated by Android Tools. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file must be checked in Version Control Systems. -# -# To customize properties used by the Ant build system use, -# "ant.properties", and override values to adapt the script to your -# project structure. - -# Project target. -target=android-10 - -android.library.reference.1=../../../../cocos/2d/platform/android/java diff --git a/samples/Javascript/MoonWarriors/proj.android/res/values/strings.xml b/samples/Javascript/MoonWarriors/proj.android/res/values/strings.xml deleted file mode 100644 index 707408a4d7..0000000000 --- a/samples/Javascript/MoonWarriors/proj.android/res/values/strings.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - MoonWarriors - diff --git a/samples/Javascript/MoonWarriors/proj.android/src/org/cocos2dx/moonwarriors/Cocos2dxActivity.java b/samples/Javascript/MoonWarriors/proj.android/src/org/cocos2dx/moonwarriors/Cocos2dxActivity.java deleted file mode 100644 index c979c4d044..0000000000 --- a/samples/Javascript/MoonWarriors/proj.android/src/org/cocos2dx/moonwarriors/Cocos2dxActivity.java +++ /dev/null @@ -1,33 +0,0 @@ -package org.cocos2dx.moonwarriors; - -import android.app.NativeActivity; -import android.graphics.PixelFormat; -import android.os.Bundle; - -public class Cocos2dxActivity extends NativeActivity { - - @Override - protected void onCreate(Bundle savedInstanceState) { - // TODO Auto-generated method stub - super.onCreate(savedInstanceState); - - //For supports translucency - - //1.change "attribs" in cocos\2d\platform\android\nativeactivity.cpp - /*const EGLint attribs[] = { - EGL_SURFACE_TYPE, EGL_WINDOW_BIT, - EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT, - //EGL_BLUE_SIZE, 5, -->delete - //EGL_GREEN_SIZE, 6, -->delete - //EGL_RED_SIZE, 5, -->delete - EGL_BUFFER_SIZE, 32, //-->new field - EGL_DEPTH_SIZE, 16, - EGL_STENCIL_SIZE, 8, - EGL_NONE - };*/ - - //2.Set the format of window - // getWindow().setFormat(PixelFormat.TRANSLUCENT); - - } -} diff --git a/samples/Javascript/MoonWarriors/proj.ios/AppController.h b/samples/Javascript/MoonWarriors/proj.ios/AppController.h deleted file mode 100644 index 10287bd13f..0000000000 --- a/samples/Javascript/MoonWarriors/proj.ios/AppController.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// testjsAppController.h -// testjs -// -// Created by Rolando Abarca on 3/19/12. -// Copyright __MyCompanyName__ 2012. All rights reserved. -// - -@class RootViewController; - -@interface AppController : NSObject { - UIWindow *window; - RootViewController *viewController; -} - -@end - diff --git a/samples/Javascript/MoonWarriors/proj.ios/AppController.mm b/samples/Javascript/MoonWarriors/proj.ios/AppController.mm deleted file mode 100644 index ca23f1b7f8..0000000000 --- a/samples/Javascript/MoonWarriors/proj.ios/AppController.mm +++ /dev/null @@ -1,119 +0,0 @@ -// -// testjsAppController.mm -// testjs -// -// Created by Rolando Abarca on 3/19/12. -// Copyright __MyCompanyName__ 2012. All rights reserved. -// -#import -#import "AppController.h" -#import "cocos2d.h" -#import "EAGLView.h" -#import "AppDelegate.h" - -#import "RootViewController.h" - -@implementation AppController - -#pragma mark - -#pragma mark Application lifecycle - -// cocos2d application instance -static AppDelegate s_sharedApplication; - -- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { - - // Override point for customization after application launch. - - // Add the view controller's view to the window and display. - window = [[UIWindow alloc] initWithFrame: [[UIScreen mainScreen] bounds]]; - CCEAGLView *__glView = [CCEAGLView viewWithFrame: [window bounds] - pixelFormat: kEAGLColorFormatRGBA8 - depthFormat: GL_DEPTH_COMPONENT16 //_OES - preserveBackbuffer: NO - sharegroup: nil - multiSampling: NO - numberOfSamples: 0 ]; - - // Use RootViewController manage CCEAGLView - viewController = [[RootViewController alloc] initWithNibName:nil bundle:nil]; - viewController.wantsFullScreenLayout = YES; - viewController.view = __glView; - - // Set RootViewController to window - if ( [[UIDevice currentDevice].systemVersion floatValue] < 6.0) - { - // warning: addSubView doesn't work on iOS6 - [window addSubview: viewController.view]; - } - else - { - // use this method on ios6 - [window setRootViewController:viewController]; - } - - [window makeKeyAndVisible]; - - [[UIApplication sharedApplication] setStatusBarHidden: YES]; - - cocos2d::Application::getInstance()->run(); - return YES; -} - - -- (void)applicationWillResignActive:(UIApplication *)application { - /* - Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state. - Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game. - */ - cocos2d::Director::getInstance()->pause(); -} - -- (void)applicationDidBecomeActive:(UIApplication *)application { - /* - Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface. - */ - cocos2d::Director::getInstance()->resume(); -} - -- (void)applicationDidEnterBackground:(UIApplication *)application { - /* - Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later. - If your application supports background execution, called instead of applicationWillTerminate: when the user quits. - */ - cocos2d::Application::getInstance()->applicationDidEnterBackground(); -} - -- (void)applicationWillEnterForeground:(UIApplication *)application { - /* - Called as part of transition from the background to the inactive state: here you can undo many of the changes made on entering the background. - */ - cocos2d::Application::getInstance()->applicationWillEnterForeground(); -} - -- (void)applicationWillTerminate:(UIApplication *)application { - /* - Called when the application is about to terminate. - See also applicationDidEnterBackground:. - */ -} - - -#pragma mark - -#pragma mark Memory management - -- (void)applicationDidReceiveMemoryWarning:(UIApplication *)application { - /* - Free up as much memory as possible by purging cached data objects that can be recreated (or reloaded from disk) later. - */ - cocos2d::Director::getInstance()->purgeCachedData(); -} - - -- (void)dealloc { - [super dealloc]; -} - - -@end - diff --git a/samples/Javascript/MoonWarriors/proj.ios/Default-568h@2x.png.REMOVED.git-id b/samples/Javascript/MoonWarriors/proj.ios/Default-568h@2x.png.REMOVED.git-id deleted file mode 100644 index 8f5838f3a8..0000000000 --- a/samples/Javascript/MoonWarriors/proj.ios/Default-568h@2x.png.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -66c6d1cead373b45218424f6a82f370897e443e4 \ No newline at end of file diff --git a/samples/Javascript/MoonWarriors/proj.ios/Default@2x.png.REMOVED.git-id b/samples/Javascript/MoonWarriors/proj.ios/Default@2x.png.REMOVED.git-id deleted file mode 100644 index 8843505b20..0000000000 --- a/samples/Javascript/MoonWarriors/proj.ios/Default@2x.png.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -84689888a14a2123d2b39f7f2f61be8c15207479 \ No newline at end of file diff --git a/samples/Javascript/MoonWarriors/proj.ios/Prefix.pch b/samples/Javascript/MoonWarriors/proj.ios/Prefix.pch deleted file mode 100644 index b056d8694a..0000000000 --- a/samples/Javascript/MoonWarriors/proj.ios/Prefix.pch +++ /dev/null @@ -1,8 +0,0 @@ -// -// Prefix header for all source files of the 'testjs' target in the 'testjs' project -// - -#ifdef __OBJC__ - #import - #import -#endif diff --git a/samples/Javascript/MoonWarriors/proj.ios/RootViewController.h b/samples/Javascript/MoonWarriors/proj.ios/RootViewController.h deleted file mode 100644 index 11dfc4bf88..0000000000 --- a/samples/Javascript/MoonWarriors/proj.ios/RootViewController.h +++ /dev/null @@ -1,33 +0,0 @@ -/**************************************************************************** - Copyright (c) 2010-2011 cocos2d-x.org - Copyright (c) 2010 Ricardo Quesada - - http://www.cocos2d-x.org - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - THE SOFTWARE. - ****************************************************************************/ - -#import - - -@interface RootViewController : UIViewController { - -} -- (BOOL)prefersStatusBarHidden; -@end diff --git a/samples/Javascript/MoonWarriors/proj.ios/RootViewController.mm b/samples/Javascript/MoonWarriors/proj.ios/RootViewController.mm deleted file mode 100644 index 3a37088ebd..0000000000 --- a/samples/Javascript/MoonWarriors/proj.ios/RootViewController.mm +++ /dev/null @@ -1,79 +0,0 @@ -// -// testjsAppController.h -// testjs -// -// Created by Rolando Abarca on 3/19/12. -// Copyright __MyCompanyName__ 2012. All rights reserved. -// - -#import "RootViewController.h" - - -@implementation RootViewController - -/* - // The designated initializer. Override if you create the controller programmatically and want to perform customization that is not appropriate for viewDidLoad. -- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil { - if ((self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil])) { - // Custom initialization - } - return self; -} -*/ - -/* -// Implement loadView to create a view hierarchy programmatically, without using a nib. -- (void)loadView { -} -*/ - -/* -// Implement viewDidLoad to do additional setup after loading the view, typically from a nib. -- (void)viewDidLoad { - [super viewDidLoad]; -} - -*/ -// Override to allow orientations other than the default portrait orientation. -// This method is deprecated on ios6 -- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { - return UIInterfaceOrientationIsPortrait(interfaceOrientation); -} - -// For ios6, use supportedInterfaceOrientations & shouldAutorotate instead -- (NSUInteger) supportedInterfaceOrientations{ -#ifdef __IPHONE_6_0 - return UIInterfaceOrientationMaskAllButUpsideDown; -#endif -} - -- (BOOL) shouldAutorotate { - return YES; -} - -//fix not hide status on ios7 -- (BOOL)prefersStatusBarHidden -{ - return YES; -} - -- (void)didReceiveMemoryWarning { - // Releases the view if it doesn't have a superview. - [super didReceiveMemoryWarning]; - - // Release any cached data, images, etc that aren't in use. -} - -- (void)viewDidUnload { - [super viewDidUnload]; - // Release any retained subviews of the main view. - // e.g. self.myOutlet = nil; -} - - -- (void)dealloc { - [super dealloc]; -} - - -@end diff --git a/samples/Javascript/MoonWarriors/proj.ios/main.m b/samples/Javascript/MoonWarriors/proj.ios/main.m deleted file mode 100644 index e3dedca28b..0000000000 --- a/samples/Javascript/MoonWarriors/proj.ios/main.m +++ /dev/null @@ -1,17 +0,0 @@ -// -// main.m -// testjs -// -// Created by Rolando Abarca on 3/19/12. -// Copyright __MyCompanyName__ 2012. All rights reserved. -// - -#import - -int main(int argc, char *argv[]) { - - NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init]; - int retVal = UIApplicationMain(argc, argv, nil, @"AppController"); - [pool release]; - return retVal; -} diff --git a/samples/Javascript/MoonWarriors/proj.mac/Icon.icns.REMOVED.git-id b/samples/Javascript/MoonWarriors/proj.mac/Icon.icns.REMOVED.git-id deleted file mode 100644 index 9874ec6979..0000000000 --- a/samples/Javascript/MoonWarriors/proj.mac/Icon.icns.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -3d09e8fb4f4ca1c1ae7ab0a6948db592c7c3d9a0 \ No newline at end of file diff --git a/samples/Javascript/MoonWarriors/proj.mac/en.lproj/InfoPlist.strings b/samples/Javascript/MoonWarriors/proj.mac/en.lproj/InfoPlist.strings deleted file mode 100644 index 477b28ff8f..0000000000 --- a/samples/Javascript/MoonWarriors/proj.mac/en.lproj/InfoPlist.strings +++ /dev/null @@ -1,2 +0,0 @@ -/* Localized versions of Info.plist keys */ - diff --git a/samples/Javascript/MoonWarriors/proj.mac/en.lproj/MainMenu.xib b/samples/Javascript/MoonWarriors/proj.mac/en.lproj/MainMenu.xib deleted file mode 100644 index 3dacdedbd0..0000000000 --- a/samples/Javascript/MoonWarriors/proj.mac/en.lproj/MainMenu.xib +++ /dev/null @@ -1,812 +0,0 @@ - - - - 1060 - 10K549 - 1938 - 1038.36 - 461.00 - - com.apple.InterfaceBuilder.CocoaPlugin - 1938 - - - YES - NSMenuItem - NSCustomObject - NSMenu - - - YES - com.apple.InterfaceBuilder.CocoaPlugin - - - PluginDependencyRecalculationVersion - - - - YES - - NSApplication - - - FirstResponder - - - NSApplication - - - AMainMenu - - YES - - - TestCpp - - 1048576 - 2147483647 - - NSImage - NSMenuCheckmark - - - NSImage - NSMenuMixedState - - submenuAction: - - TestCpp - - YES - - - About TestCpp - - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Preferences… - , - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Services - - 1048576 - 2147483647 - - - submenuAction: - - Services - - YES - - _NSServicesMenu - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Hide TestCpp - h - 1048576 - 2147483647 - - - - - - Hide Others - h - 1572864 - 2147483647 - - - - - - Show All - - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Quit TestCpp - q - 1048576 - 2147483647 - - - - - _NSAppleMenu - - - - - View - - 1048576 - 2147483647 - - - submenuAction: - - View - - YES - - - Toggle Fullscreen - f - 1048576 - 2147483647 - - - - - - - - - Window - - 1048576 - 2147483647 - - - submenuAction: - - Window - - YES - - - Minimize - m - 1048576 - 2147483647 - - - - - - Zoom - - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Bring All to Front - - 1048576 - 2147483647 - - - - - _NSWindowsMenu - - - - - Help - - 2147483647 - - - submenuAction: - - Help - - YES - - - TestCpp Help - ? - 1048576 - 2147483647 - - - - - _NSHelpMenu - - - - _NSMainMenu - - - AppController - - - NSFontManager - - - - - YES - - - terminate: - - - - 449 - - - - orderFrontStandardAboutPanel: - - - - 142 - - - - delegate - - - - 495 - - - - performMiniaturize: - - - - 37 - - - - arrangeInFront: - - - - 39 - - - - performZoom: - - - - 240 - - - - hide: - - - - 367 - - - - hideOtherApplications: - - - - 368 - - - - unhideAllApplications: - - - - 370 - - - - showHelp: - - - - 493 - - - - toggleFullScreen: - - - - 537 - - - - - YES - - 0 - - YES - - - - - - -2 - - - File's Owner - - - -1 - - - First Responder - - - -3 - - - Application - - - 29 - - - YES - - - - - - - - - 19 - - - YES - - - - - - 56 - - - YES - - - - - - 57 - - - YES - - - - - - - - - - - - - - - - 58 - - - - - 134 - - - - - 150 - - - - - 136 - - - - - 144 - - - - - 129 - - - - - 143 - - - - - 236 - - - - - 131 - - - YES - - - - - - 149 - - - - - 145 - - - - - 130 - - - - - 24 - - - YES - - - - - - - - - 92 - - - - - 5 - - - - - 239 - - - - - 23 - - - - - 295 - - - YES - - - - - - 296 - - - YES - - - - - - 420 - - - - - 490 - - - YES - - - - - - 491 - - - YES - - - - - - 492 - - - - - 494 - - - - - 536 - - - - - - - YES - - YES - -1.IBPluginDependency - -2.IBPluginDependency - -3.IBPluginDependency - 129.IBPluginDependency - 130.IBPluginDependency - 131.IBPluginDependency - 134.IBPluginDependency - 136.IBPluginDependency - 143.IBPluginDependency - 144.IBPluginDependency - 145.IBPluginDependency - 149.IBPluginDependency - 150.IBPluginDependency - 19.IBPluginDependency - 23.IBPluginDependency - 236.IBPluginDependency - 239.IBPluginDependency - 24.IBPluginDependency - 29.IBPluginDependency - 295.IBPluginDependency - 296.IBPluginDependency - 420.IBPluginDependency - 490.IBPluginDependency - 491.IBPluginDependency - 492.IBPluginDependency - 494.IBPluginDependency - 5.IBPluginDependency - 536.IBPluginDependency - 56.IBPluginDependency - 57.IBPluginDependency - 58.IBPluginDependency - 92.IBPluginDependency - - - YES - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - - - YES - - - - - - YES - - - - - 541 - - - - YES - - AppController - NSObject - - YES - - YES - exitFullScreen: - toggleFullScreen: - - - YES - id - id - - - - YES - - YES - exitFullScreen: - toggleFullScreen: - - - YES - - exitFullScreen: - id - - - toggleFullScreen: - id - - - - - YES - - YES - glView - window - - - YES - EAGLView - NSWindow - - - - YES - - YES - glView - window - - - YES - - glView - EAGLView - - - window - NSWindow - - - - - IBProjectSource - ./Classes/AppController.h - - - - EAGLView - NSOpenGLView - - IBProjectSource - ./Classes/EAGLView.h - - - - - 0 - IBCocoaFramework - - com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 - - - YES - 3 - - YES - - YES - NSMenuCheckmark - NSMenuMixedState - - - YES - {9, 8} - {7, 2} - - - - diff --git a/samples/Javascript/MoonWarriors/proj.mac/main.cpp b/samples/Javascript/MoonWarriors/proj.mac/main.cpp deleted file mode 100644 index 1c421ad511..0000000000 --- a/samples/Javascript/MoonWarriors/proj.mac/main.cpp +++ /dev/null @@ -1,37 +0,0 @@ -/**************************************************************************** - Copyright (c) 2010 cocos2d-x.org - - http://www.cocos2d-x.org - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - THE SOFTWARE. - ****************************************************************************/ - -#include "AppDelegate.h" -#include "cocos2d.h" - -USING_NS_CC; - -int main(int argc, char *argv[]) -{ - AppDelegate app; - EGLView eglView; - eglView.init("MoonWarriors", 480, 720); - return Application::getInstance()->run(); -} - diff --git a/samples/Javascript/MoonWarriors/proj.win32/MoonWarriors.vcxproj b/samples/Javascript/MoonWarriors/proj.win32/MoonWarriors.vcxproj deleted file mode 100644 index d0dfa15e88..0000000000 --- a/samples/Javascript/MoonWarriors/proj.win32/MoonWarriors.vcxproj +++ /dev/null @@ -1,235 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {1DB7C0FC-46FF-4A1B-82E0-C6244EEEC4C2} - MoonWarriors - - - - Application - Unicode - v100 - v110 - v110_xp - - - Application - Unicode - v100 - v110 - v110_xp - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration).win32\ - $(Configuration).win32\ - false - $(SolutionDir)$(Configuration).win32\ - $(Configuration).win32\ - false - AllRules.ruleset - - - AllRules.ruleset - - - - - $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath) - - - $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath) - - - - _DEBUG;%(PreprocessorDefinitions) - false - Win32 - true - $(IntDir)testjs.tlb - testjs.h - - - testjs_i.c - testjs_p.c - - - Disabled - .;..\Classes;$(EngineRoot);$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\scripting\auto-generated\js-bindings;$(EngineRoot)cocos\scripting\javascript\bindings;$(EngineRoot)cocos\audio\include;$(EngineRoot)external\spidermonkey\include\win32;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;%(AdditionalIncludeDirectories) - WIN32;_WINDOWS;STRICT;_DEBUG;DEBUG;XP_WIN;JS_HAVE___INTN;JS_INTPTR_TYPE=int;COCOS2D_DEBUG=1;COCOS2D_JAVASCRIPT=1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - false - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - 4267;4251;4244;%(DisableSpecificWarnings) - true - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(IntDir);%(AdditionalIncludeDirectories) - - - if not exist "$(OutDir)" mkdir "$(OutDir)" -xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\spidermonkey\prebuilt\win32\*.*" "$(OutDir)" - - - - libcurl_imp.lib;mozjs-25.0.lib;ws2_32.lib;sqlite3.lib;%(AdditionalDependencies) - $(OutDir);%(AdditionalLibraryDirectories) - true - Windows - MachineX86 - - - if not exist "$(OutDir)" mkdir "$(OutDir)" -if exist "$(OutDir)\MoonWarriorsRes" rd /s /q "$(OutDir)\MoonWarriorsRes" -mkdir "$(OutDir)\MoonWarriorsRes" -xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\javascript\script\*.js" "$(OutDir)\MoonWarriorsRes" /e /Y -xcopy "$(ProjectDir)..\..\Shared\games\MoonWarriors" "$(OutDir)\MoonWarriorsRes\" /e /Y - Copy js and resource files. - - - - - NDEBUG;%(PreprocessorDefinitions) - false - Win32 - true - $(IntDir)testjs.tlb - testjs.h - - - testjs_i.c - testjs_p.c - - - .;..\Classes;$(EngineRoot);$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\scripting\auto-generated\js-bindings;$(EngineRoot)cocos\scripting\javascript\bindings;$(EngineRoot)cocos\audio\include;$(EngineRoot)external\spidermonkey\include\win32;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;%(AdditionalIncludeDirectories) - WIN32;_WINDOWS;STRICT;NDEBUG;XP_WIN;JS_HAVE___INTN;JS_INTPTR_TYPE=int;COCOS2D_JAVASCRIPT=1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - - - MultiThreadedDLL - - - Level3 - - - 4267;4251;4244;%(DisableSpecificWarnings) - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(IntDir);%(AdditionalIncludeDirectories) - - - if not exist "$(OutDir)" mkdir "$(OutDir)" -xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\spidermonkey\prebuilt\win32\*.*" "$(OutDir)" - - - - libcurl_imp.lib;mozjs-25.0.lib;ws2_32.lib;sqlite3.lib;%(AdditionalDependencies) - $(OutDir);%(AdditionalLibraryDirectories) - Windows - MachineX86 - true - - - if not exist "$(OutDir)" mkdir "$(OutDir)" -if exist "$(OutDir)\MoonWarriorsRes" rd /s /q "$(OutDir)\MoonWarriorsRes" -mkdir "$(OutDir)\MoonWarriorsRes" -xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\javascript\script\*.js" "$(OutDir)\MoonWarriorsRes" /e /Y -xcopy "$(ProjectDir)..\..\Shared\games\MoonWarriors" "$(OutDir)\MoonWarriorsRes\" /e /Y - Copy js and resource files. - - - - - - - - - - - - - - - - - - - - {98a51ba8-fc3a-415b-ac8f-8c7bd464e93e} - - - {f8edd7fa-9a51-4e80-baeb-860825d2eac6} - - - {811c0dab-7b96-4bd3-a154-b7572b58e4ab} - - - {b57cf53f-2e49-4031-9822-047cc0e6bde2} - - - {7e06e92c-537a-442b-9e4a-4761c84f8a1a} - - - {df2638c0-8128-4847-867c-6eafe3dee7b5} - - - {21070e58-eec6-4e16-8b4f-6d083df55790} - - - {f9da0fc1-651b-457b-962e-a4d61cebf5fd} - - - {625f7391-9a91-48a1-8cfc-79508c822637} - - - {68f5f371-bd7b-4c30-ae5b-0b08f22e0cde} - - - {39379840-825a-45a0-b363-c09ffef864bd} - - - {632a8f38-d0f0-4d22-86b3-d69f5e6bf63a} - - - {21b2c324-891f-48ea-ad1a-5ae13de12e28} - - - {207bc7a9-ccf1-4f2f-a04d-45f72242ae25} - - - - - - \ No newline at end of file diff --git a/samples/Javascript/MoonWarriors/proj.win32/MoonWarriors.vcxproj.filters b/samples/Javascript/MoonWarriors/proj.win32/MoonWarriors.vcxproj.filters deleted file mode 100644 index 56df37ce6f..0000000000 --- a/samples/Javascript/MoonWarriors/proj.win32/MoonWarriors.vcxproj.filters +++ /dev/null @@ -1,44 +0,0 @@ - - - - - {ca9c9e15-d942-43a1-aa7a-5f0b74ca1afd} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;jpg;jpeg;jpe;png;manifest - - - {ccb2323b-1cfa-41ea-bcf4-ba5f07309396} - - - {e93a77e1-af1e-4400-87d3-504b62ebdbb0} - - - - - win32 - - - Classes - - - - - win32 - - - win32 - - - Classes - - - - - resource - - - - - resource - - - \ No newline at end of file diff --git a/samples/Javascript/MoonWarriors/proj.win32/MoonWarriors.vcxproj.user b/samples/Javascript/MoonWarriors/proj.win32/MoonWarriors.vcxproj.user deleted file mode 100644 index 475efbea21..0000000000 --- a/samples/Javascript/MoonWarriors/proj.win32/MoonWarriors.vcxproj.user +++ /dev/null @@ -1,11 +0,0 @@ - - - - $(OutDir)\MoonWarriorsRes - WindowsLocalDebugger - - - $(OutDir)\MoonWarriorsRes - WindowsLocalDebugger - - \ No newline at end of file diff --git a/samples/Javascript/MoonWarriors/proj.win32/main.cpp b/samples/Javascript/MoonWarriors/proj.win32/main.cpp deleted file mode 100644 index 42d84925be..0000000000 --- a/samples/Javascript/MoonWarriors/proj.win32/main.cpp +++ /dev/null @@ -1,37 +0,0 @@ -#include "main.h" -#include "AppDelegate.h" -#include "CCEGLView.h" - -USING_NS_CC; - -// uncomment below line, open debug console -// #define USE_WIN32_CONSOLE - -int APIENTRY _tWinMain(HINSTANCE hInstance, - HINSTANCE hPrevInstance, - LPTSTR lpCmdLine, - int nCmdShow) -{ - UNREFERENCED_PARAMETER(hPrevInstance); - UNREFERENCED_PARAMETER(lpCmdLine); - -#ifdef USE_WIN32_CONSOLE - AllocConsole(); - freopen("CONIN$", "r", stdin); - freopen("CONOUT$", "w", stdout); - freopen("CONOUT$", "w", stderr); -#endif - - // create the application instance - AppDelegate app; - EGLView eglView; - eglView.init("MoonWarriors", 480, 720); - - int ret = Application::getInstance()->run(); - -#ifdef USE_WIN32_CONSOLE - FreeConsole(); -#endif - - return ret; -} diff --git a/samples/Javascript/MoonWarriors/proj.win32/main.h b/samples/Javascript/MoonWarriors/proj.win32/main.h deleted file mode 100644 index e29aeedb3a..0000000000 --- a/samples/Javascript/MoonWarriors/proj.win32/main.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef __MAIN_H__ -#define __MAIN_H__ - -#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers - -// Windows Header Files: -#include - -// C RunTime Header Files -#include "CCStdC.h" - -#endif // __WINMAIN_H__ diff --git a/samples/Javascript/MoonWarriors/proj.win32/res/testjs.ico b/samples/Javascript/MoonWarriors/proj.win32/res/testjs.ico deleted file mode 100644 index feaf932a7465e435af6271bd8204c0145731a6eb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 47629 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 - - - - - - - - diff --git a/samples/Javascript/TestJavascript/proj.android/.settings/org.eclipse.cdt.codan.core.prefs b/samples/Javascript/TestJavascript/proj.android/.settings/org.eclipse.cdt.codan.core.prefs deleted file mode 100644 index bad4196993..0000000000 --- a/samples/Javascript/TestJavascript/proj.android/.settings/org.eclipse.cdt.codan.core.prefs +++ /dev/null @@ -1,68 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.cdt.codan.checkers.errnoreturn=-Warning -org.eclipse.cdt.codan.checkers.errnoreturn.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},implicit\=>false} -org.eclipse.cdt.codan.checkers.errreturnvalue=-Error -org.eclipse.cdt.codan.checkers.errreturnvalue.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.checkers.noreturn=-Error -org.eclipse.cdt.codan.checkers.noreturn.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},implicit\=>false} -org.eclipse.cdt.codan.internal.checkers.AbstractClassCreation=-Error -org.eclipse.cdt.codan.internal.checkers.AbstractClassCreation.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.AmbiguousProblem=-Error -org.eclipse.cdt.codan.internal.checkers.AmbiguousProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.AssignmentInConditionProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.AssignmentInConditionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.AssignmentToItselfProblem=-Error -org.eclipse.cdt.codan.internal.checkers.AssignmentToItselfProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.CaseBreakProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.CaseBreakProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},no_break_comment\=>"no break",last_case_param\=>true,empty_case_param\=>false} -org.eclipse.cdt.codan.internal.checkers.CatchByReference=-Warning -org.eclipse.cdt.codan.internal.checkers.CatchByReference.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},unknown\=>false,exceptions\=>()} -org.eclipse.cdt.codan.internal.checkers.CircularReferenceProblem=-Error -org.eclipse.cdt.codan.internal.checkers.CircularReferenceProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.ClassMembersInitialization=-Warning -org.eclipse.cdt.codan.internal.checkers.ClassMembersInitialization.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},skip\=>true} -org.eclipse.cdt.codan.internal.checkers.FieldResolutionProblem=-Error -org.eclipse.cdt.codan.internal.checkers.FieldResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.FunctionResolutionProblem=-Error -org.eclipse.cdt.codan.internal.checkers.FunctionResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.InvalidArguments=-Error -org.eclipse.cdt.codan.internal.checkers.InvalidArguments.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.InvalidTemplateArgumentsProblem=-Error -org.eclipse.cdt.codan.internal.checkers.InvalidTemplateArgumentsProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.LabelStatementNotFoundProblem=-Error -org.eclipse.cdt.codan.internal.checkers.LabelStatementNotFoundProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.MemberDeclarationNotFoundProblem=-Error -org.eclipse.cdt.codan.internal.checkers.MemberDeclarationNotFoundProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.MethodResolutionProblem=-Error -org.eclipse.cdt.codan.internal.checkers.MethodResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.NamingConventionFunctionChecker=-Info -org.eclipse.cdt.codan.internal.checkers.NamingConventionFunctionChecker.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},pattern\=>"^[a-z]",macro\=>true,exceptions\=>()} -org.eclipse.cdt.codan.internal.checkers.NonVirtualDestructorProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.NonVirtualDestructorProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.OverloadProblem=-Error -org.eclipse.cdt.codan.internal.checkers.OverloadProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.RedeclarationProblem=-Error -org.eclipse.cdt.codan.internal.checkers.RedeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.RedefinitionProblem=-Error -org.eclipse.cdt.codan.internal.checkers.RedefinitionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.ReturnStyleProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.ReturnStyleProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.ScanfFormatStringSecurityProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.ScanfFormatStringSecurityProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.StatementHasNoEffectProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.StatementHasNoEffectProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true,exceptions\=>()} -org.eclipse.cdt.codan.internal.checkers.SuggestedParenthesisProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.SuggestedParenthesisProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},paramNot\=>false} -org.eclipse.cdt.codan.internal.checkers.SuspiciousSemicolonProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.SuspiciousSemicolonProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},else\=>false,afterelse\=>false} -org.eclipse.cdt.codan.internal.checkers.TypeResolutionProblem=-Error -org.eclipse.cdt.codan.internal.checkers.TypeResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.UnusedFunctionDeclarationProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.UnusedFunctionDeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true} -org.eclipse.cdt.codan.internal.checkers.UnusedStaticFunctionProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.UnusedStaticFunctionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true} -org.eclipse.cdt.codan.internal.checkers.UnusedVariableDeclarationProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.UnusedVariableDeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true,exceptions\=>("@(\#)","$Id")} -org.eclipse.cdt.codan.internal.checkers.VariableResolutionProblem=-Error -org.eclipse.cdt.codan.internal.checkers.VariableResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -useParentScope=false diff --git a/samples/Javascript/TestJavascript/proj.android/README.md b/samples/Javascript/TestJavascript/proj.android/README.md deleted file mode 100644 index 312835611a..0000000000 --- a/samples/Javascript/TestJavascript/proj.android/README.md +++ /dev/null @@ -1,87 +0,0 @@ -## Prerequisites: - -* Android NDK -* Android SDK **OR** Eclipse ADT Bundle -* Android AVD target installed - -## Building project - -There are two ways of building Android projects. - -1. Eclipse -2. Command Line - -### Import Project in Eclipse - -#### Features: - -1. Complete workflow from Eclipse, including: - * Build C++. - * Clean C++. - * Build and Run whole project. - * Logcat view. - * Debug Java code. - * Javascript editor. - * Project management. -2. True C++ editing, including: - * Code completion. - * Jump to definition. - * Refactoring tools etc. - * Quick open C++ files. - - -#### Setup Eclipse Environment (only once) - - -**NOTE:** This step needs to be done only once to setup the Eclipse environment for cocos2d-x projects. Skip this section if you've done this before. - -1. Download Eclipse ADT bundle from [Google ADT homepage](http://developer.android.com/sdk/index.html) - - **OR** - - Install Eclipse with Java. Add ADT and CDT plugins. - -2. Only for Windows - 1. Install [Cygwin](http://www.cygwin.com/) with make (select make package from the list during the install). - 2. Add `Cygwin\bin` directory to system PATH variable. - 3. Add this line `none /cygdrive cygdrive binary,noacl,posix=0,user 0 0` to `Cygwin\etc\fstab` file. - -3. Set up Variables: - 1. Path Variable `COCOS2DX`: - * Eclipse->Preferences->General->Workspace->**Linked Resources** - * Click **New** button to add a Path Variable `COCOS2DX` pointing to the root cocos2d-x directory. - ![Example](https://lh5.googleusercontent.com/-oPpk9kg3e5w/UUOYlq8n7aI/AAAAAAAAsdQ/zLA4eghBH9U/s400/cocos2d-x-eclipse-vars.png) - - 2. C/C++ Environment Variable `NDK_ROOT`: - * Eclipse->Preferences->C/C++->Build->**Environment**. - * Click **Add** button and add a new variable `NDK_ROOT` pointing to the root NDK directory. - ![Example](https://lh3.googleusercontent.com/-AVcY8IAT0_g/UUOYltoRobI/AAAAAAAAsdM/22D2J9u3sig/s400/cocos2d-x-eclipse-ndk.png) - * Only for Windows: Add new variables **CYGWIN** with value `nodosfilewarning` and **SHELLOPTS** with value `igncr` - -4. Import libcocos2dx library project: - 1. File->New->Project->Android Project From Existing Code. - 2. Click **Browse** button and open `cocos2d-x/cocos2dx/platform/android/java` directory. - 3. Click **Finish** to add project. - -#### Adding and running from Eclipse - -![Example](https://lh3.googleusercontent.com/-SLBOu6e3QbE/UUOcOXYaGqI/AAAAAAAAsdo/tYBY2SylOSM/s288/cocos2d-x-eclipse-project-from-code.png) ![Import](https://lh5.googleusercontent.com/-XzC9Pn65USc/UUOcOTAwizI/AAAAAAAAsdk/4b6YM-oim9Y/s400/cocos2d-x-eclipse-import-project.png) - -1. File->New->Project->Android Project From Existing Code -2. **Browse** to your project directory. eg: `cocos2d-x/cocos2dx/samples/Cpp/TestCpp/proj.android/` -3. Add the project -4. Click **Run** or **Debug** to compile C++ followed by Java and to run on connected device or emulator. - - -### Running project from Command Line - - $ cd cocos2d-x/samples/Cpp/TestCpp/proj.android/ - $ export NDK_ROOT=/path/to/ndk - $ ./build_native.sh - $ ant debug install - -If the last command results in sdk.dir missing error then do: - - $ android list target - $ android update project -p . -t (id from step 6) - $ android update project -p cocos2d-x/cocos2dx/platform/android/java/ -t (id from step 6) diff --git a/samples/Javascript/TestJavascript/proj.android/ant.properties b/samples/Javascript/TestJavascript/proj.android/ant.properties deleted file mode 100644 index f8af38bfb4..0000000000 --- a/samples/Javascript/TestJavascript/proj.android/ant.properties +++ /dev/null @@ -1 +0,0 @@ -aapt.ignore.assets="!*.pvr.gz:!*.gz:!.svn:!.git:.*:_*:!CVS:!thumbs.db:!picasa.ini:!*.scc:*~" diff --git a/samples/Javascript/TestJavascript/proj.android/jni/Application.mk b/samples/Javascript/TestJavascript/proj.android/jni/Application.mk deleted file mode 100644 index 47d8add103..0000000000 --- a/samples/Javascript/TestJavascript/proj.android/jni/Application.mk +++ /dev/null @@ -1,5 +0,0 @@ -APP_STL := gnustl_static - -# add -Wno-literal-suffix to avoid warning: warning: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wliteral-suffix] -# in NDK_ROOT/arch-arm/usr/include/sys/cdefs_elf.h:35:28: when using ndk-r9 -APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -DCOCOS2D_DEBUG=1 -std=c++11 -Wno-literal-suffix -fsigned-char diff --git a/samples/Javascript/TestJavascript/proj.android/jni/testjavascript/main.cpp b/samples/Javascript/TestJavascript/proj.android/jni/testjavascript/main.cpp deleted file mode 100644 index 9793beefb1..0000000000 --- a/samples/Javascript/TestJavascript/proj.android/jni/testjavascript/main.cpp +++ /dev/null @@ -1,16 +0,0 @@ -#include "AppDelegate.h" -#include "cocos2d.h" -#include "platform/android/jni/JniHelper.h" -#include "CCEventType.h" -#include -#include - -#define LOG_TAG "main" -#define LOGD(...) __android_log_print(ANDROID_LOG_DEBUG,LOG_TAG,__VA_ARGS__) - -using namespace cocos2d; - -void cocos_android_app_init (struct android_app* app) { - LOGD("cocos_android_app_init"); - AppDelegate *pAppDelegate = new AppDelegate(); -} diff --git a/samples/Javascript/TestJavascript/proj.android/proguard-project.txt b/samples/Javascript/TestJavascript/proj.android/proguard-project.txt deleted file mode 100644 index f2fe1559a2..0000000000 --- a/samples/Javascript/TestJavascript/proj.android/proguard-project.txt +++ /dev/null @@ -1,20 +0,0 @@ -# To enable ProGuard in your project, edit project.properties -# to define the proguard.config property as described in that file. -# -# Add project specific ProGuard rules here. -# By default, the flags in this file are appended to flags specified -# in ${sdk.dir}/tools/proguard/proguard-android.txt -# You can edit the include path and order by changing the ProGuard -# include property in project.properties. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# Add any project specific keep options here: - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} diff --git a/samples/Javascript/TestJavascript/proj.android/project.properties b/samples/Javascript/TestJavascript/proj.android/project.properties deleted file mode 100644 index 0a6dc6664d..0000000000 --- a/samples/Javascript/TestJavascript/proj.android/project.properties +++ /dev/null @@ -1,13 +0,0 @@ -# This file is automatically generated by Android Tools. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file must be checked in Version Control Systems. -# -# To customize properties used by the Ant build system use, -# "ant.properties", and override values to adapt the script to your -# project structure. - -# Project target. -target=android-10 - -android.library.reference.1=../../../../cocos/2d/platform/android/java diff --git a/samples/Javascript/TestJavascript/proj.ios/AppController.h b/samples/Javascript/TestJavascript/proj.ios/AppController.h deleted file mode 100644 index 10287bd13f..0000000000 --- a/samples/Javascript/TestJavascript/proj.ios/AppController.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// testjsAppController.h -// testjs -// -// Created by Rolando Abarca on 3/19/12. -// Copyright __MyCompanyName__ 2012. All rights reserved. -// - -@class RootViewController; - -@interface AppController : NSObject { - UIWindow *window; - RootViewController *viewController; -} - -@end - diff --git a/samples/Javascript/TestJavascript/proj.ios/Default-568h@2x.png.REMOVED.git-id b/samples/Javascript/TestJavascript/proj.ios/Default-568h@2x.png.REMOVED.git-id deleted file mode 100644 index 8f5838f3a8..0000000000 --- a/samples/Javascript/TestJavascript/proj.ios/Default-568h@2x.png.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -66c6d1cead373b45218424f6a82f370897e443e4 \ No newline at end of file diff --git a/samples/Javascript/TestJavascript/proj.ios/Default@2x.png.REMOVED.git-id b/samples/Javascript/TestJavascript/proj.ios/Default@2x.png.REMOVED.git-id deleted file mode 100644 index 8843505b20..0000000000 --- a/samples/Javascript/TestJavascript/proj.ios/Default@2x.png.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -84689888a14a2123d2b39f7f2f61be8c15207479 \ No newline at end of file diff --git a/samples/Javascript/TestJavascript/proj.ios/Prefix.pch b/samples/Javascript/TestJavascript/proj.ios/Prefix.pch deleted file mode 100644 index b056d8694a..0000000000 --- a/samples/Javascript/TestJavascript/proj.ios/Prefix.pch +++ /dev/null @@ -1,8 +0,0 @@ -// -// Prefix header for all source files of the 'testjs' target in the 'testjs' project -// - -#ifdef __OBJC__ - #import - #import -#endif diff --git a/samples/Javascript/TestJavascript/proj.ios/RootViewController.h b/samples/Javascript/TestJavascript/proj.ios/RootViewController.h deleted file mode 100644 index 11dfc4bf88..0000000000 --- a/samples/Javascript/TestJavascript/proj.ios/RootViewController.h +++ /dev/null @@ -1,33 +0,0 @@ -/**************************************************************************** - Copyright (c) 2010-2011 cocos2d-x.org - Copyright (c) 2010 Ricardo Quesada - - http://www.cocos2d-x.org - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - THE SOFTWARE. - ****************************************************************************/ - -#import - - -@interface RootViewController : UIViewController { - -} -- (BOOL)prefersStatusBarHidden; -@end diff --git a/samples/Javascript/TestJavascript/proj.ios/RootViewController.mm b/samples/Javascript/TestJavascript/proj.ios/RootViewController.mm deleted file mode 100644 index 8438d7a420..0000000000 --- a/samples/Javascript/TestJavascript/proj.ios/RootViewController.mm +++ /dev/null @@ -1,79 +0,0 @@ -// -// testjsAppController.h -// testjs -// -// Created by Rolando Abarca on 3/19/12. -// Copyright __MyCompanyName__ 2012. All rights reserved. -// - -#import "RootViewController.h" - - -@implementation RootViewController - -/* - // The designated initializer. Override if you create the controller programmatically and want to perform customization that is not appropriate for viewDidLoad. -- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil { - if ((self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil])) { - // Custom initialization - } - return self; -} -*/ - -/* -// Implement loadView to create a view hierarchy programmatically, without using a nib. -- (void)loadView { -} -*/ - -/* -// Implement viewDidLoad to do additional setup after loading the view, typically from a nib. -- (void)viewDidLoad { - [super viewDidLoad]; -} - -*/ -// Override to allow orientations other than the default portrait orientation. -// This method is deprecated on ios6 -- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { - return UIInterfaceOrientationIsLandscape( interfaceOrientation ); -} - -// For ios6, use supportedInterfaceOrientations & shouldAutorotate instead -- (NSUInteger) supportedInterfaceOrientations{ -#ifdef __IPHONE_6_0 - return UIInterfaceOrientationMaskAllButUpsideDown; -#endif -} - -- (BOOL) shouldAutorotate { - return YES; -} - -//fix not hide status on ios7 -- (BOOL)prefersStatusBarHidden -{ - return YES; -} - -- (void)didReceiveMemoryWarning { - // Releases the view if it doesn't have a superview. - [super didReceiveMemoryWarning]; - - // Release any cached data, images, etc that aren't in use. -} - -- (void)viewDidUnload { - [super viewDidUnload]; - // Release any retained subviews of the main view. - // e.g. self.myOutlet = nil; -} - - -- (void)dealloc { - [super dealloc]; -} - - -@end diff --git a/samples/Javascript/TestJavascript/proj.ios/main.m b/samples/Javascript/TestJavascript/proj.ios/main.m deleted file mode 100644 index e3dedca28b..0000000000 --- a/samples/Javascript/TestJavascript/proj.ios/main.m +++ /dev/null @@ -1,17 +0,0 @@ -// -// main.m -// testjs -// -// Created by Rolando Abarca on 3/19/12. -// Copyright __MyCompanyName__ 2012. All rights reserved. -// - -#import - -int main(int argc, char *argv[]) { - - NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init]; - int retVal = UIApplicationMain(argc, argv, nil, @"AppController"); - [pool release]; - return retVal; -} diff --git a/samples/Javascript/TestJavascript/proj.mac/Icon.icns.REMOVED.git-id b/samples/Javascript/TestJavascript/proj.mac/Icon.icns.REMOVED.git-id deleted file mode 100644 index 9874ec6979..0000000000 --- a/samples/Javascript/TestJavascript/proj.mac/Icon.icns.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -3d09e8fb4f4ca1c1ae7ab0a6948db592c7c3d9a0 \ No newline at end of file diff --git a/samples/Javascript/TestJavascript/proj.mac/en.lproj/InfoPlist.strings b/samples/Javascript/TestJavascript/proj.mac/en.lproj/InfoPlist.strings deleted file mode 100644 index 477b28ff8f..0000000000 --- a/samples/Javascript/TestJavascript/proj.mac/en.lproj/InfoPlist.strings +++ /dev/null @@ -1,2 +0,0 @@ -/* Localized versions of Info.plist keys */ - diff --git a/samples/Javascript/TestJavascript/proj.mac/en.lproj/MainMenu.xib b/samples/Javascript/TestJavascript/proj.mac/en.lproj/MainMenu.xib deleted file mode 100644 index 3dacdedbd0..0000000000 --- a/samples/Javascript/TestJavascript/proj.mac/en.lproj/MainMenu.xib +++ /dev/null @@ -1,812 +0,0 @@ - - - - 1060 - 10K549 - 1938 - 1038.36 - 461.00 - - com.apple.InterfaceBuilder.CocoaPlugin - 1938 - - - YES - NSMenuItem - NSCustomObject - NSMenu - - - YES - com.apple.InterfaceBuilder.CocoaPlugin - - - PluginDependencyRecalculationVersion - - - - YES - - NSApplication - - - FirstResponder - - - NSApplication - - - AMainMenu - - YES - - - TestCpp - - 1048576 - 2147483647 - - NSImage - NSMenuCheckmark - - - NSImage - NSMenuMixedState - - submenuAction: - - TestCpp - - YES - - - About TestCpp - - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Preferences… - , - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Services - - 1048576 - 2147483647 - - - submenuAction: - - Services - - YES - - _NSServicesMenu - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Hide TestCpp - h - 1048576 - 2147483647 - - - - - - Hide Others - h - 1572864 - 2147483647 - - - - - - Show All - - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Quit TestCpp - q - 1048576 - 2147483647 - - - - - _NSAppleMenu - - - - - View - - 1048576 - 2147483647 - - - submenuAction: - - View - - YES - - - Toggle Fullscreen - f - 1048576 - 2147483647 - - - - - - - - - Window - - 1048576 - 2147483647 - - - submenuAction: - - Window - - YES - - - Minimize - m - 1048576 - 2147483647 - - - - - - Zoom - - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Bring All to Front - - 1048576 - 2147483647 - - - - - _NSWindowsMenu - - - - - Help - - 2147483647 - - - submenuAction: - - Help - - YES - - - TestCpp Help - ? - 1048576 - 2147483647 - - - - - _NSHelpMenu - - - - _NSMainMenu - - - AppController - - - NSFontManager - - - - - YES - - - terminate: - - - - 449 - - - - orderFrontStandardAboutPanel: - - - - 142 - - - - delegate - - - - 495 - - - - performMiniaturize: - - - - 37 - - - - arrangeInFront: - - - - 39 - - - - performZoom: - - - - 240 - - - - hide: - - - - 367 - - - - hideOtherApplications: - - - - 368 - - - - unhideAllApplications: - - - - 370 - - - - showHelp: - - - - 493 - - - - toggleFullScreen: - - - - 537 - - - - - YES - - 0 - - YES - - - - - - -2 - - - File's Owner - - - -1 - - - First Responder - - - -3 - - - Application - - - 29 - - - YES - - - - - - - - - 19 - - - YES - - - - - - 56 - - - YES - - - - - - 57 - - - YES - - - - - - - - - - - - - - - - 58 - - - - - 134 - - - - - 150 - - - - - 136 - - - - - 144 - - - - - 129 - - - - - 143 - - - - - 236 - - - - - 131 - - - YES - - - - - - 149 - - - - - 145 - - - - - 130 - - - - - 24 - - - YES - - - - - - - - - 92 - - - - - 5 - - - - - 239 - - - - - 23 - - - - - 295 - - - YES - - - - - - 296 - - - YES - - - - - - 420 - - - - - 490 - - - YES - - - - - - 491 - - - YES - - - - - - 492 - - - - - 494 - - - - - 536 - - - - - - - YES - - YES - -1.IBPluginDependency - -2.IBPluginDependency - -3.IBPluginDependency - 129.IBPluginDependency - 130.IBPluginDependency - 131.IBPluginDependency - 134.IBPluginDependency - 136.IBPluginDependency - 143.IBPluginDependency - 144.IBPluginDependency - 145.IBPluginDependency - 149.IBPluginDependency - 150.IBPluginDependency - 19.IBPluginDependency - 23.IBPluginDependency - 236.IBPluginDependency - 239.IBPluginDependency - 24.IBPluginDependency - 29.IBPluginDependency - 295.IBPluginDependency - 296.IBPluginDependency - 420.IBPluginDependency - 490.IBPluginDependency - 491.IBPluginDependency - 492.IBPluginDependency - 494.IBPluginDependency - 5.IBPluginDependency - 536.IBPluginDependency - 56.IBPluginDependency - 57.IBPluginDependency - 58.IBPluginDependency - 92.IBPluginDependency - - - YES - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - - - YES - - - - - - YES - - - - - 541 - - - - YES - - AppController - NSObject - - YES - - YES - exitFullScreen: - toggleFullScreen: - - - YES - id - id - - - - YES - - YES - exitFullScreen: - toggleFullScreen: - - - YES - - exitFullScreen: - id - - - toggleFullScreen: - id - - - - - YES - - YES - glView - window - - - YES - EAGLView - NSWindow - - - - YES - - YES - glView - window - - - YES - - glView - EAGLView - - - window - NSWindow - - - - - IBProjectSource - ./Classes/AppController.h - - - - EAGLView - NSOpenGLView - - IBProjectSource - ./Classes/EAGLView.h - - - - - 0 - IBCocoaFramework - - com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 - - - YES - 3 - - YES - - YES - NSMenuCheckmark - NSMenuMixedState - - - YES - {9, 8} - {7, 2} - - - - diff --git a/samples/Javascript/TestJavascript/proj.win32/main.h b/samples/Javascript/TestJavascript/proj.win32/main.h deleted file mode 100644 index e29aeedb3a..0000000000 --- a/samples/Javascript/TestJavascript/proj.win32/main.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef __MAIN_H__ -#define __MAIN_H__ - -#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers - -// Windows Header Files: -#include - -// C RunTime Header Files -#include "CCStdC.h" - -#endif // __WINMAIN_H__ diff --git a/samples/Javascript/TestJavascript/proj.win32/res/testjs.ico b/samples/Javascript/TestJavascript/proj.win32/res/testjs.ico deleted file mode 100644 index feaf932a7465e435af6271bd8204c0145731a6eb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 47629 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::getInstance()); - - // turn on display FPS - pDirector->setDisplayStats(true); - - // set FPS. the default value is 1.0/60 if you don't call this - pDirector->setAnimationInterval(1.0 / 60); - - EGLView::getInstance()->setDesignResolutionSize(480, 320, ResolutionPolicy::FIXED_HEIGHT); - - FileUtils::getInstance()->addSearchPath("script"); - - ScriptingCore* sc = ScriptingCore::getInstance(); - sc->addRegisterCallback(register_all_cocos2dx); - sc->addRegisterCallback(register_all_cocos2dx_extension); - sc->addRegisterCallback(register_all_cocos2dx_extension_manual); - sc->addRegisterCallback(register_cocos2dx_js_extensions); - sc->addRegisterCallback(jsb_register_chipmunk); - sc->addRegisterCallback(register_all_cocos2dx_builder); - sc->addRegisterCallback(register_CCBuilderReader); - sc->addRegisterCallback(jsb_register_system); - sc->addRegisterCallback(JSB_register_opengl); - - sc->start(); - -#if defined(COCOS2D_DEBUG) && (COCOS2D_DEBUG > 0) - sc->enableDebugger(); -#endif - - auto pEngine = ScriptingCore::getInstance(); - ScriptEngineManager::getInstance()->setScriptEngine(pEngine); - ScriptingCore::getInstance()->runScript("boot-jsb.js"); - - return true; -} - -// This function will be called when the app is inactive. When comes a phone call,it's be invoked too -void AppDelegate::applicationDidEnterBackground() -{ - Director::getInstance()->stopAnimation(); - SimpleAudioEngine::getInstance()->pauseBackgroundMusic(); - SimpleAudioEngine::getInstance()->pauseAllEffects(); -} - -// this function will be called when the app is active again -void AppDelegate::applicationWillEnterForeground() -{ - Director::getInstance()->startAnimation(); - SimpleAudioEngine::getInstance()->resumeBackgroundMusic(); - SimpleAudioEngine::getInstance()->resumeAllEffects(); -} diff --git a/samples/Javascript/WatermelonWithMe/Classes/AppDelegate.h b/samples/Javascript/WatermelonWithMe/Classes/AppDelegate.h deleted file mode 100644 index df8f12f70f..0000000000 --- a/samples/Javascript/WatermelonWithMe/Classes/AppDelegate.h +++ /dev/null @@ -1,45 +0,0 @@ -// -// GCTestAppDelegate.h -// GCTest -// -// Created by Rohan Kuruvilla on 06/08/2012. -// Copyright __MyCompanyName__ 2012. All rights reserved. -// - -#ifndef _APP_DELEGATE_H_ -#define _APP_DELEGATE_H_ - -#include "CCApplication.h" -/** - @brief The cocos2d Application. - - The reason for implement as private inheritance is to hide some interface call by Director. - */ -class AppDelegate : private cocos2d::Application -{ -public: - AppDelegate(); - virtual ~AppDelegate(); - - /** - @brief Implement Director and Scene init code here. - @return true Initialize success, app continue. - @return false Initialize failed, app terminate. - */ - virtual bool applicationDidFinishLaunching(); - - /** - @brief The function be called when the application enter background - @param the pointer of the application - */ - virtual void applicationDidEnterBackground(); - - /** - @brief The function be called when the application enter foreground - @param the pointer of the application - */ - virtual void applicationWillEnterForeground(); -}; - -#endif // _APP_DELEGATE_H_ - diff --git a/samples/Javascript/WatermelonWithMe/proj.android/.classpath b/samples/Javascript/WatermelonWithMe/proj.android/.classpath deleted file mode 100644 index 0b08408342..0000000000 --- a/samples/Javascript/WatermelonWithMe/proj.android/.classpath +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/samples/Javascript/WatermelonWithMe/proj.android/.project b/samples/Javascript/WatermelonWithMe/proj.android/.project deleted file mode 100644 index 1a3080f5bb..0000000000 --- a/samples/Javascript/WatermelonWithMe/proj.android/.project +++ /dev/null @@ -1,70 +0,0 @@ - - - WatermelonWithMe - - - - - - com.android.ide.eclipse.adt.ResourceManagerBuilder - - - - - com.android.ide.eclipse.adt.PreCompilerBuilder - - - - - org.eclipse.jdt.core.javabuilder - - - - - com.android.ide.eclipse.adt.ApkBuilder - - - - - org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder - full,incremental, - - - - - - com.android.ide.eclipse.adt.AndroidNature - org.eclipse.jdt.core.javanature - org.eclipse.cdt.core.cnature - org.eclipse.cdt.core.ccnature - org.eclipse.cdt.managedbuilder.core.managedBuildNature - org.eclipse.cdt.managedbuilder.core.ScannerConfigNature - - - - Classes - 2 - COCOS2DX/samples/Javascript/WatermelonWithMe/Classes - - - cocos2dx - 2 - COCOS2DX/cocos2dx - - - cocosdenshion - 2 - COCOS2DX/CocosDenshion - - - extensions - 2 - COCOS2DX/extensions - - - scripting - 2 - COCOS2DX/scripting - - - diff --git a/samples/Javascript/WatermelonWithMe/proj.android/.settings/org.eclipse.cdt.codan.core.prefs b/samples/Javascript/WatermelonWithMe/proj.android/.settings/org.eclipse.cdt.codan.core.prefs deleted file mode 100644 index bad4196993..0000000000 --- a/samples/Javascript/WatermelonWithMe/proj.android/.settings/org.eclipse.cdt.codan.core.prefs +++ /dev/null @@ -1,68 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.cdt.codan.checkers.errnoreturn=-Warning -org.eclipse.cdt.codan.checkers.errnoreturn.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},implicit\=>false} -org.eclipse.cdt.codan.checkers.errreturnvalue=-Error -org.eclipse.cdt.codan.checkers.errreturnvalue.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.checkers.noreturn=-Error -org.eclipse.cdt.codan.checkers.noreturn.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},implicit\=>false} -org.eclipse.cdt.codan.internal.checkers.AbstractClassCreation=-Error -org.eclipse.cdt.codan.internal.checkers.AbstractClassCreation.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.AmbiguousProblem=-Error -org.eclipse.cdt.codan.internal.checkers.AmbiguousProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.AssignmentInConditionProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.AssignmentInConditionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.AssignmentToItselfProblem=-Error -org.eclipse.cdt.codan.internal.checkers.AssignmentToItselfProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.CaseBreakProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.CaseBreakProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},no_break_comment\=>"no break",last_case_param\=>true,empty_case_param\=>false} -org.eclipse.cdt.codan.internal.checkers.CatchByReference=-Warning -org.eclipse.cdt.codan.internal.checkers.CatchByReference.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},unknown\=>false,exceptions\=>()} -org.eclipse.cdt.codan.internal.checkers.CircularReferenceProblem=-Error -org.eclipse.cdt.codan.internal.checkers.CircularReferenceProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.ClassMembersInitialization=-Warning -org.eclipse.cdt.codan.internal.checkers.ClassMembersInitialization.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},skip\=>true} -org.eclipse.cdt.codan.internal.checkers.FieldResolutionProblem=-Error -org.eclipse.cdt.codan.internal.checkers.FieldResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.FunctionResolutionProblem=-Error -org.eclipse.cdt.codan.internal.checkers.FunctionResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.InvalidArguments=-Error -org.eclipse.cdt.codan.internal.checkers.InvalidArguments.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.InvalidTemplateArgumentsProblem=-Error -org.eclipse.cdt.codan.internal.checkers.InvalidTemplateArgumentsProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.LabelStatementNotFoundProblem=-Error -org.eclipse.cdt.codan.internal.checkers.LabelStatementNotFoundProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.MemberDeclarationNotFoundProblem=-Error -org.eclipse.cdt.codan.internal.checkers.MemberDeclarationNotFoundProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.MethodResolutionProblem=-Error -org.eclipse.cdt.codan.internal.checkers.MethodResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.NamingConventionFunctionChecker=-Info -org.eclipse.cdt.codan.internal.checkers.NamingConventionFunctionChecker.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},pattern\=>"^[a-z]",macro\=>true,exceptions\=>()} -org.eclipse.cdt.codan.internal.checkers.NonVirtualDestructorProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.NonVirtualDestructorProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.OverloadProblem=-Error -org.eclipse.cdt.codan.internal.checkers.OverloadProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.RedeclarationProblem=-Error -org.eclipse.cdt.codan.internal.checkers.RedeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.RedefinitionProblem=-Error -org.eclipse.cdt.codan.internal.checkers.RedefinitionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.ReturnStyleProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.ReturnStyleProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.ScanfFormatStringSecurityProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.ScanfFormatStringSecurityProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.StatementHasNoEffectProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.StatementHasNoEffectProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true,exceptions\=>()} -org.eclipse.cdt.codan.internal.checkers.SuggestedParenthesisProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.SuggestedParenthesisProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},paramNot\=>false} -org.eclipse.cdt.codan.internal.checkers.SuspiciousSemicolonProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.SuspiciousSemicolonProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},else\=>false,afterelse\=>false} -org.eclipse.cdt.codan.internal.checkers.TypeResolutionProblem=-Error -org.eclipse.cdt.codan.internal.checkers.TypeResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.UnusedFunctionDeclarationProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.UnusedFunctionDeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true} -org.eclipse.cdt.codan.internal.checkers.UnusedStaticFunctionProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.UnusedStaticFunctionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true} -org.eclipse.cdt.codan.internal.checkers.UnusedVariableDeclarationProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.UnusedVariableDeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true,exceptions\=>("@(\#)","$Id")} -org.eclipse.cdt.codan.internal.checkers.VariableResolutionProblem=-Error -org.eclipse.cdt.codan.internal.checkers.VariableResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -useParentScope=false diff --git a/samples/Javascript/WatermelonWithMe/proj.android/AndroidManifest.xml b/samples/Javascript/WatermelonWithMe/proj.android/AndroidManifest.xml deleted file mode 100644 index 517c887410..0000000000 --- a/samples/Javascript/WatermelonWithMe/proj.android/AndroidManifest.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/samples/Javascript/WatermelonWithMe/proj.android/README.md b/samples/Javascript/WatermelonWithMe/proj.android/README.md deleted file mode 100644 index 312835611a..0000000000 --- a/samples/Javascript/WatermelonWithMe/proj.android/README.md +++ /dev/null @@ -1,87 +0,0 @@ -## Prerequisites: - -* Android NDK -* Android SDK **OR** Eclipse ADT Bundle -* Android AVD target installed - -## Building project - -There are two ways of building Android projects. - -1. Eclipse -2. Command Line - -### Import Project in Eclipse - -#### Features: - -1. Complete workflow from Eclipse, including: - * Build C++. - * Clean C++. - * Build and Run whole project. - * Logcat view. - * Debug Java code. - * Javascript editor. - * Project management. -2. True C++ editing, including: - * Code completion. - * Jump to definition. - * Refactoring tools etc. - * Quick open C++ files. - - -#### Setup Eclipse Environment (only once) - - -**NOTE:** This step needs to be done only once to setup the Eclipse environment for cocos2d-x projects. Skip this section if you've done this before. - -1. Download Eclipse ADT bundle from [Google ADT homepage](http://developer.android.com/sdk/index.html) - - **OR** - - Install Eclipse with Java. Add ADT and CDT plugins. - -2. Only for Windows - 1. Install [Cygwin](http://www.cygwin.com/) with make (select make package from the list during the install). - 2. Add `Cygwin\bin` directory to system PATH variable. - 3. Add this line `none /cygdrive cygdrive binary,noacl,posix=0,user 0 0` to `Cygwin\etc\fstab` file. - -3. Set up Variables: - 1. Path Variable `COCOS2DX`: - * Eclipse->Preferences->General->Workspace->**Linked Resources** - * Click **New** button to add a Path Variable `COCOS2DX` pointing to the root cocos2d-x directory. - ![Example](https://lh5.googleusercontent.com/-oPpk9kg3e5w/UUOYlq8n7aI/AAAAAAAAsdQ/zLA4eghBH9U/s400/cocos2d-x-eclipse-vars.png) - - 2. C/C++ Environment Variable `NDK_ROOT`: - * Eclipse->Preferences->C/C++->Build->**Environment**. - * Click **Add** button and add a new variable `NDK_ROOT` pointing to the root NDK directory. - ![Example](https://lh3.googleusercontent.com/-AVcY8IAT0_g/UUOYltoRobI/AAAAAAAAsdM/22D2J9u3sig/s400/cocos2d-x-eclipse-ndk.png) - * Only for Windows: Add new variables **CYGWIN** with value `nodosfilewarning` and **SHELLOPTS** with value `igncr` - -4. Import libcocos2dx library project: - 1. File->New->Project->Android Project From Existing Code. - 2. Click **Browse** button and open `cocos2d-x/cocos2dx/platform/android/java` directory. - 3. Click **Finish** to add project. - -#### Adding and running from Eclipse - -![Example](https://lh3.googleusercontent.com/-SLBOu6e3QbE/UUOcOXYaGqI/AAAAAAAAsdo/tYBY2SylOSM/s288/cocos2d-x-eclipse-project-from-code.png) ![Import](https://lh5.googleusercontent.com/-XzC9Pn65USc/UUOcOTAwizI/AAAAAAAAsdk/4b6YM-oim9Y/s400/cocos2d-x-eclipse-import-project.png) - -1. File->New->Project->Android Project From Existing Code -2. **Browse** to your project directory. eg: `cocos2d-x/cocos2dx/samples/Cpp/TestCpp/proj.android/` -3. Add the project -4. Click **Run** or **Debug** to compile C++ followed by Java and to run on connected device or emulator. - - -### Running project from Command Line - - $ cd cocos2d-x/samples/Cpp/TestCpp/proj.android/ - $ export NDK_ROOT=/path/to/ndk - $ ./build_native.sh - $ ant debug install - -If the last command results in sdk.dir missing error then do: - - $ android list target - $ android update project -p . -t (id from step 6) - $ android update project -p cocos2d-x/cocos2dx/platform/android/java/ -t (id from step 6) diff --git a/samples/Javascript/WatermelonWithMe/proj.android/ant.properties b/samples/Javascript/WatermelonWithMe/proj.android/ant.properties deleted file mode 100644 index f8af38bfb4..0000000000 --- a/samples/Javascript/WatermelonWithMe/proj.android/ant.properties +++ /dev/null @@ -1 +0,0 @@ -aapt.ignore.assets="!*.pvr.gz:!*.gz:!.svn:!.git:.*:_*:!CVS:!thumbs.db:!picasa.ini:!*.scc:*~" diff --git a/samples/Javascript/WatermelonWithMe/proj.android/build.xml b/samples/Javascript/WatermelonWithMe/proj.android/build.xml deleted file mode 100644 index f3fd9b9293..0000000000 --- a/samples/Javascript/WatermelonWithMe/proj.android/build.xml +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/samples/Javascript/WatermelonWithMe/proj.android/jni/Android.mk b/samples/Javascript/WatermelonWithMe/proj.android/jni/Android.mk deleted file mode 100644 index 2d7b4097ab..0000000000 --- a/samples/Javascript/WatermelonWithMe/proj.android/jni/Android.mk +++ /dev/null @@ -1,30 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE := watermelonwithme_shared - -LOCAL_MODULE_FILENAME := libwatermelonwithme - -LOCAL_SRC_FILES := watermelonwithme/main.cpp \ - ../../Classes/AppDelegate.cpp - -LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../Classes - -LOCAL_WHOLE_STATIC_LIBRARIES := cocos_jsb_static -LOCAL_WHOLE_STATIC_LIBRARIES += jsb_chipmunk_static -LOCAL_WHOLE_STATIC_LIBRARIES += jsb_extension_static -LOCAL_WHOLE_STATIC_LIBRARIES += jsb_localstorage_static -LOCAL_WHOLE_STATIC_LIBRARIES += jsb_network_static -LOCAL_WHOLE_STATIC_LIBRARIES += jsb_builder_static - -LOCAL_EXPORT_CFLAGS := -DCOCOS2D_DEBUG=2 -DCOCOS2D_JAVASCRIPT - -include $(BUILD_SHARED_LIBRARY) - -$(call import-module,scripting/javascript/bindings) -$(call import-module,scripting/javascript/bindings/chipmunk) -$(call import-module,scripting/javascript/bindings/extension) -$(call import-module,scripting/javascript/bindings/localstorage) -$(call import-module,scripting/javascript/bindings/network) -$(call import-module,scripting/javascript/bindings/cocosbuilder) diff --git a/samples/Javascript/WatermelonWithMe/proj.android/jni/Application.mk b/samples/Javascript/WatermelonWithMe/proj.android/jni/Application.mk deleted file mode 100644 index 47d8add103..0000000000 --- a/samples/Javascript/WatermelonWithMe/proj.android/jni/Application.mk +++ /dev/null @@ -1,5 +0,0 @@ -APP_STL := gnustl_static - -# add -Wno-literal-suffix to avoid warning: warning: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wliteral-suffix] -# in NDK_ROOT/arch-arm/usr/include/sys/cdefs_elf.h:35:28: when using ndk-r9 -APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -DCOCOS2D_DEBUG=1 -std=c++11 -Wno-literal-suffix -fsigned-char diff --git a/samples/Javascript/WatermelonWithMe/proj.android/jni/watermelonwithme/main.cpp b/samples/Javascript/WatermelonWithMe/proj.android/jni/watermelonwithme/main.cpp deleted file mode 100644 index 9793beefb1..0000000000 --- a/samples/Javascript/WatermelonWithMe/proj.android/jni/watermelonwithme/main.cpp +++ /dev/null @@ -1,16 +0,0 @@ -#include "AppDelegate.h" -#include "cocos2d.h" -#include "platform/android/jni/JniHelper.h" -#include "CCEventType.h" -#include -#include - -#define LOG_TAG "main" -#define LOGD(...) __android_log_print(ANDROID_LOG_DEBUG,LOG_TAG,__VA_ARGS__) - -using namespace cocos2d; - -void cocos_android_app_init (struct android_app* app) { - LOGD("cocos_android_app_init"); - AppDelegate *pAppDelegate = new AppDelegate(); -} diff --git a/samples/Javascript/WatermelonWithMe/proj.android/ndkgdb.sh b/samples/Javascript/WatermelonWithMe/proj.android/ndkgdb.sh deleted file mode 100644 index 5df7332ceb..0000000000 --- a/samples/Javascript/WatermelonWithMe/proj.android/ndkgdb.sh +++ /dev/null @@ -1,47 +0,0 @@ -APPNAME="TestJavascript" -APP_ANDROID_NAME="org.cocos2dx.testjavascript" - -if [ -z "${SDK_ROOT+aaa}" ]; then -# ... if SDK_ROOT is not set, use "$HOME/bin/android-sdk" - SDK_ROOT="$HOME/bin/android-sdk" -fi - -if [ -z "${NDK_ROOT+aaa}" ]; then -# ... if NDK_ROOT is not set, use "$HOME/bin/android-ndk" - NDK_ROOT="$HOME/bin/android-ndk" -fi - -if [ -z "${COCOS2DX_ROOT+aaa}" ]; then -# ... if COCOS2DX_ROOT is not set -# ... find current working directory - DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -# ... use paths relative to current directory - COCOS2DX_ROOT="$DIR/../../.." - APP_ROOT="$DIR/.." - APP_ANDROID_ROOT="$DIR" -else - APP_ROOT="$COCOS2DX_ROOT/samples/$APPNAME" - APP_ANDROID_ROOT="$COCOS2DX_ROOT/samples/$APPNAME/proj.android" -fi - -echo "NDK_ROOT = $NDK_ROOT" -echo "SDK_ROOT = $SDK_ROOT" -echo "COCOS2DX_ROOT = $COCOS2DX_ROOT" -echo "APP_ROOT = $APP_ROOT" -echo "APP_ANDROID_ROOT = $APP_ANDROID_ROOT" -echo "APP_ANDROID_NAME = $APP_ANDROID_NAME" - -echo -echo "Killing and restarting ${APP_ANDROID_NAME}" -echo - -set -x - -"${SDK_ROOT}"/platform-tools/adb shell am force-stop "${APP_ANDROID_NAME}" - -NDK_MODULE_PATH="${COCOS2DX_ROOT}":"${COCOS2DX_ROOT}"/cocos2dx/platform/third_party/android/prebuilt \ - "${NDK_ROOT}"/ndk-gdb \ - --adb="${SDK_ROOT}"/platform-tools/adb \ - --verbose \ - --start \ - --force diff --git a/samples/Javascript/WatermelonWithMe/proj.android/proguard-project.txt b/samples/Javascript/WatermelonWithMe/proj.android/proguard-project.txt deleted file mode 100644 index f2fe1559a2..0000000000 --- a/samples/Javascript/WatermelonWithMe/proj.android/proguard-project.txt +++ /dev/null @@ -1,20 +0,0 @@ -# To enable ProGuard in your project, edit project.properties -# to define the proguard.config property as described in that file. -# -# Add project specific ProGuard rules here. -# By default, the flags in this file are appended to flags specified -# in ${sdk.dir}/tools/proguard/proguard-android.txt -# You can edit the include path and order by changing the ProGuard -# include property in project.properties. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# Add any project specific keep options here: - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} diff --git a/samples/Javascript/WatermelonWithMe/proj.android/project.properties b/samples/Javascript/WatermelonWithMe/proj.android/project.properties deleted file mode 100644 index 0a6dc6664d..0000000000 --- a/samples/Javascript/WatermelonWithMe/proj.android/project.properties +++ /dev/null @@ -1,13 +0,0 @@ -# This file is automatically generated by Android Tools. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file must be checked in Version Control Systems. -# -# To customize properties used by the Ant build system use, -# "ant.properties", and override values to adapt the script to your -# project structure. - -# Project target. -target=android-10 - -android.library.reference.1=../../../../cocos/2d/platform/android/java diff --git a/samples/Javascript/WatermelonWithMe/proj.android/res/values/strings.xml b/samples/Javascript/WatermelonWithMe/proj.android/res/values/strings.xml deleted file mode 100644 index 89aa34dcac..0000000000 --- a/samples/Javascript/WatermelonWithMe/proj.android/res/values/strings.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - WatermelonWithMe - diff --git a/samples/Javascript/WatermelonWithMe/proj.android/src/org/cocos2dx/watermelonwithme/Cocos2dxActivity.java b/samples/Javascript/WatermelonWithMe/proj.android/src/org/cocos2dx/watermelonwithme/Cocos2dxActivity.java deleted file mode 100644 index 3fd0f293cf..0000000000 --- a/samples/Javascript/WatermelonWithMe/proj.android/src/org/cocos2dx/watermelonwithme/Cocos2dxActivity.java +++ /dev/null @@ -1,33 +0,0 @@ -package org.cocos2dx.watermelonwithme; - -import android.app.NativeActivity; -import android.graphics.PixelFormat; -import android.os.Bundle; - -public class Cocos2dxActivity extends NativeActivity { - - @Override - protected void onCreate(Bundle savedInstanceState) { - // TODO Auto-generated method stub - super.onCreate(savedInstanceState); - - //For supports translucency - - //1.change "attribs" in cocos\2d\platform\android\nativeactivity.cpp - /*const EGLint attribs[] = { - EGL_SURFACE_TYPE, EGL_WINDOW_BIT, - EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT, - //EGL_BLUE_SIZE, 5, -->delete - //EGL_GREEN_SIZE, 6, -->delete - //EGL_RED_SIZE, 5, -->delete - EGL_BUFFER_SIZE, 32, //-->new field - EGL_DEPTH_SIZE, 16, - EGL_STENCIL_SIZE, 8, - EGL_NONE - };*/ - - //2.Set the format of window - // getWindow().setFormat(PixelFormat.TRANSLUCENT); - - } -} diff --git a/samples/Javascript/WatermelonWithMe/proj.ios/AppController.h b/samples/Javascript/WatermelonWithMe/proj.ios/AppController.h deleted file mode 100644 index 10287bd13f..0000000000 --- a/samples/Javascript/WatermelonWithMe/proj.ios/AppController.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// testjsAppController.h -// testjs -// -// Created by Rolando Abarca on 3/19/12. -// Copyright __MyCompanyName__ 2012. All rights reserved. -// - -@class RootViewController; - -@interface AppController : NSObject { - UIWindow *window; - RootViewController *viewController; -} - -@end - diff --git a/samples/Javascript/WatermelonWithMe/proj.ios/AppController.mm b/samples/Javascript/WatermelonWithMe/proj.ios/AppController.mm deleted file mode 100644 index ca23f1b7f8..0000000000 --- a/samples/Javascript/WatermelonWithMe/proj.ios/AppController.mm +++ /dev/null @@ -1,119 +0,0 @@ -// -// testjsAppController.mm -// testjs -// -// Created by Rolando Abarca on 3/19/12. -// Copyright __MyCompanyName__ 2012. All rights reserved. -// -#import -#import "AppController.h" -#import "cocos2d.h" -#import "EAGLView.h" -#import "AppDelegate.h" - -#import "RootViewController.h" - -@implementation AppController - -#pragma mark - -#pragma mark Application lifecycle - -// cocos2d application instance -static AppDelegate s_sharedApplication; - -- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { - - // Override point for customization after application launch. - - // Add the view controller's view to the window and display. - window = [[UIWindow alloc] initWithFrame: [[UIScreen mainScreen] bounds]]; - CCEAGLView *__glView = [CCEAGLView viewWithFrame: [window bounds] - pixelFormat: kEAGLColorFormatRGBA8 - depthFormat: GL_DEPTH_COMPONENT16 //_OES - preserveBackbuffer: NO - sharegroup: nil - multiSampling: NO - numberOfSamples: 0 ]; - - // Use RootViewController manage CCEAGLView - viewController = [[RootViewController alloc] initWithNibName:nil bundle:nil]; - viewController.wantsFullScreenLayout = YES; - viewController.view = __glView; - - // Set RootViewController to window - if ( [[UIDevice currentDevice].systemVersion floatValue] < 6.0) - { - // warning: addSubView doesn't work on iOS6 - [window addSubview: viewController.view]; - } - else - { - // use this method on ios6 - [window setRootViewController:viewController]; - } - - [window makeKeyAndVisible]; - - [[UIApplication sharedApplication] setStatusBarHidden: YES]; - - cocos2d::Application::getInstance()->run(); - return YES; -} - - -- (void)applicationWillResignActive:(UIApplication *)application { - /* - Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state. - Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game. - */ - cocos2d::Director::getInstance()->pause(); -} - -- (void)applicationDidBecomeActive:(UIApplication *)application { - /* - Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface. - */ - cocos2d::Director::getInstance()->resume(); -} - -- (void)applicationDidEnterBackground:(UIApplication *)application { - /* - Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later. - If your application supports background execution, called instead of applicationWillTerminate: when the user quits. - */ - cocos2d::Application::getInstance()->applicationDidEnterBackground(); -} - -- (void)applicationWillEnterForeground:(UIApplication *)application { - /* - Called as part of transition from the background to the inactive state: here you can undo many of the changes made on entering the background. - */ - cocos2d::Application::getInstance()->applicationWillEnterForeground(); -} - -- (void)applicationWillTerminate:(UIApplication *)application { - /* - Called when the application is about to terminate. - See also applicationDidEnterBackground:. - */ -} - - -#pragma mark - -#pragma mark Memory management - -- (void)applicationDidReceiveMemoryWarning:(UIApplication *)application { - /* - Free up as much memory as possible by purging cached data objects that can be recreated (or reloaded from disk) later. - */ - cocos2d::Director::getInstance()->purgeCachedData(); -} - - -- (void)dealloc { - [super dealloc]; -} - - -@end - diff --git a/samples/Javascript/WatermelonWithMe/proj.ios/Default-568h@2x.png.REMOVED.git-id b/samples/Javascript/WatermelonWithMe/proj.ios/Default-568h@2x.png.REMOVED.git-id deleted file mode 100644 index 8f5838f3a8..0000000000 --- a/samples/Javascript/WatermelonWithMe/proj.ios/Default-568h@2x.png.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -66c6d1cead373b45218424f6a82f370897e443e4 \ No newline at end of file diff --git a/samples/Javascript/WatermelonWithMe/proj.ios/Default@2x.png.REMOVED.git-id b/samples/Javascript/WatermelonWithMe/proj.ios/Default@2x.png.REMOVED.git-id deleted file mode 100644 index 8843505b20..0000000000 --- a/samples/Javascript/WatermelonWithMe/proj.ios/Default@2x.png.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -84689888a14a2123d2b39f7f2f61be8c15207479 \ No newline at end of file diff --git a/samples/Javascript/WatermelonWithMe/proj.ios/Prefix.pch b/samples/Javascript/WatermelonWithMe/proj.ios/Prefix.pch deleted file mode 100644 index b056d8694a..0000000000 --- a/samples/Javascript/WatermelonWithMe/proj.ios/Prefix.pch +++ /dev/null @@ -1,8 +0,0 @@ -// -// Prefix header for all source files of the 'testjs' target in the 'testjs' project -// - -#ifdef __OBJC__ - #import - #import -#endif diff --git a/samples/Javascript/WatermelonWithMe/proj.ios/RootViewController.h b/samples/Javascript/WatermelonWithMe/proj.ios/RootViewController.h deleted file mode 100644 index 11dfc4bf88..0000000000 --- a/samples/Javascript/WatermelonWithMe/proj.ios/RootViewController.h +++ /dev/null @@ -1,33 +0,0 @@ -/**************************************************************************** - Copyright (c) 2010-2011 cocos2d-x.org - Copyright (c) 2010 Ricardo Quesada - - http://www.cocos2d-x.org - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - THE SOFTWARE. - ****************************************************************************/ - -#import - - -@interface RootViewController : UIViewController { - -} -- (BOOL)prefersStatusBarHidden; -@end diff --git a/samples/Javascript/WatermelonWithMe/proj.ios/RootViewController.mm b/samples/Javascript/WatermelonWithMe/proj.ios/RootViewController.mm deleted file mode 100644 index 8438d7a420..0000000000 --- a/samples/Javascript/WatermelonWithMe/proj.ios/RootViewController.mm +++ /dev/null @@ -1,79 +0,0 @@ -// -// testjsAppController.h -// testjs -// -// Created by Rolando Abarca on 3/19/12. -// Copyright __MyCompanyName__ 2012. All rights reserved. -// - -#import "RootViewController.h" - - -@implementation RootViewController - -/* - // The designated initializer. Override if you create the controller programmatically and want to perform customization that is not appropriate for viewDidLoad. -- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil { - if ((self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil])) { - // Custom initialization - } - return self; -} -*/ - -/* -// Implement loadView to create a view hierarchy programmatically, without using a nib. -- (void)loadView { -} -*/ - -/* -// Implement viewDidLoad to do additional setup after loading the view, typically from a nib. -- (void)viewDidLoad { - [super viewDidLoad]; -} - -*/ -// Override to allow orientations other than the default portrait orientation. -// This method is deprecated on ios6 -- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { - return UIInterfaceOrientationIsLandscape( interfaceOrientation ); -} - -// For ios6, use supportedInterfaceOrientations & shouldAutorotate instead -- (NSUInteger) supportedInterfaceOrientations{ -#ifdef __IPHONE_6_0 - return UIInterfaceOrientationMaskAllButUpsideDown; -#endif -} - -- (BOOL) shouldAutorotate { - return YES; -} - -//fix not hide status on ios7 -- (BOOL)prefersStatusBarHidden -{ - return YES; -} - -- (void)didReceiveMemoryWarning { - // Releases the view if it doesn't have a superview. - [super didReceiveMemoryWarning]; - - // Release any cached data, images, etc that aren't in use. -} - -- (void)viewDidUnload { - [super viewDidUnload]; - // Release any retained subviews of the main view. - // e.g. self.myOutlet = nil; -} - - -- (void)dealloc { - [super dealloc]; -} - - -@end diff --git a/samples/Javascript/WatermelonWithMe/proj.ios/main.m b/samples/Javascript/WatermelonWithMe/proj.ios/main.m deleted file mode 100644 index e3dedca28b..0000000000 --- a/samples/Javascript/WatermelonWithMe/proj.ios/main.m +++ /dev/null @@ -1,17 +0,0 @@ -// -// main.m -// testjs -// -// Created by Rolando Abarca on 3/19/12. -// Copyright __MyCompanyName__ 2012. All rights reserved. -// - -#import - -int main(int argc, char *argv[]) { - - NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init]; - int retVal = UIApplicationMain(argc, argv, nil, @"AppController"); - [pool release]; - return retVal; -} diff --git a/samples/Javascript/WatermelonWithMe/proj.mac/Icon.icns.REMOVED.git-id b/samples/Javascript/WatermelonWithMe/proj.mac/Icon.icns.REMOVED.git-id deleted file mode 100644 index 9874ec6979..0000000000 --- a/samples/Javascript/WatermelonWithMe/proj.mac/Icon.icns.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -3d09e8fb4f4ca1c1ae7ab0a6948db592c7c3d9a0 \ No newline at end of file diff --git a/samples/Javascript/WatermelonWithMe/proj.mac/en.lproj/InfoPlist.strings b/samples/Javascript/WatermelonWithMe/proj.mac/en.lproj/InfoPlist.strings deleted file mode 100644 index 477b28ff8f..0000000000 --- a/samples/Javascript/WatermelonWithMe/proj.mac/en.lproj/InfoPlist.strings +++ /dev/null @@ -1,2 +0,0 @@ -/* Localized versions of Info.plist keys */ - diff --git a/samples/Javascript/WatermelonWithMe/proj.mac/en.lproj/MainMenu.xib b/samples/Javascript/WatermelonWithMe/proj.mac/en.lproj/MainMenu.xib deleted file mode 100644 index 3dacdedbd0..0000000000 --- a/samples/Javascript/WatermelonWithMe/proj.mac/en.lproj/MainMenu.xib +++ /dev/null @@ -1,812 +0,0 @@ - - - - 1060 - 10K549 - 1938 - 1038.36 - 461.00 - - com.apple.InterfaceBuilder.CocoaPlugin - 1938 - - - YES - NSMenuItem - NSCustomObject - NSMenu - - - YES - com.apple.InterfaceBuilder.CocoaPlugin - - - PluginDependencyRecalculationVersion - - - - YES - - NSApplication - - - FirstResponder - - - NSApplication - - - AMainMenu - - YES - - - TestCpp - - 1048576 - 2147483647 - - NSImage - NSMenuCheckmark - - - NSImage - NSMenuMixedState - - submenuAction: - - TestCpp - - YES - - - About TestCpp - - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Preferences… - , - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Services - - 1048576 - 2147483647 - - - submenuAction: - - Services - - YES - - _NSServicesMenu - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Hide TestCpp - h - 1048576 - 2147483647 - - - - - - Hide Others - h - 1572864 - 2147483647 - - - - - - Show All - - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Quit TestCpp - q - 1048576 - 2147483647 - - - - - _NSAppleMenu - - - - - View - - 1048576 - 2147483647 - - - submenuAction: - - View - - YES - - - Toggle Fullscreen - f - 1048576 - 2147483647 - - - - - - - - - Window - - 1048576 - 2147483647 - - - submenuAction: - - Window - - YES - - - Minimize - m - 1048576 - 2147483647 - - - - - - Zoom - - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Bring All to Front - - 1048576 - 2147483647 - - - - - _NSWindowsMenu - - - - - Help - - 2147483647 - - - submenuAction: - - Help - - YES - - - TestCpp Help - ? - 1048576 - 2147483647 - - - - - _NSHelpMenu - - - - _NSMainMenu - - - AppController - - - NSFontManager - - - - - YES - - - terminate: - - - - 449 - - - - orderFrontStandardAboutPanel: - - - - 142 - - - - delegate - - - - 495 - - - - performMiniaturize: - - - - 37 - - - - arrangeInFront: - - - - 39 - - - - performZoom: - - - - 240 - - - - hide: - - - - 367 - - - - hideOtherApplications: - - - - 368 - - - - unhideAllApplications: - - - - 370 - - - - showHelp: - - - - 493 - - - - toggleFullScreen: - - - - 537 - - - - - YES - - 0 - - YES - - - - - - -2 - - - File's Owner - - - -1 - - - First Responder - - - -3 - - - Application - - - 29 - - - YES - - - - - - - - - 19 - - - YES - - - - - - 56 - - - YES - - - - - - 57 - - - YES - - - - - - - - - - - - - - - - 58 - - - - - 134 - - - - - 150 - - - - - 136 - - - - - 144 - - - - - 129 - - - - - 143 - - - - - 236 - - - - - 131 - - - YES - - - - - - 149 - - - - - 145 - - - - - 130 - - - - - 24 - - - YES - - - - - - - - - 92 - - - - - 5 - - - - - 239 - - - - - 23 - - - - - 295 - - - YES - - - - - - 296 - - - YES - - - - - - 420 - - - - - 490 - - - YES - - - - - - 491 - - - YES - - - - - - 492 - - - - - 494 - - - - - 536 - - - - - - - YES - - YES - -1.IBPluginDependency - -2.IBPluginDependency - -3.IBPluginDependency - 129.IBPluginDependency - 130.IBPluginDependency - 131.IBPluginDependency - 134.IBPluginDependency - 136.IBPluginDependency - 143.IBPluginDependency - 144.IBPluginDependency - 145.IBPluginDependency - 149.IBPluginDependency - 150.IBPluginDependency - 19.IBPluginDependency - 23.IBPluginDependency - 236.IBPluginDependency - 239.IBPluginDependency - 24.IBPluginDependency - 29.IBPluginDependency - 295.IBPluginDependency - 296.IBPluginDependency - 420.IBPluginDependency - 490.IBPluginDependency - 491.IBPluginDependency - 492.IBPluginDependency - 494.IBPluginDependency - 5.IBPluginDependency - 536.IBPluginDependency - 56.IBPluginDependency - 57.IBPluginDependency - 58.IBPluginDependency - 92.IBPluginDependency - - - YES - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - - - YES - - - - - - YES - - - - - 541 - - - - YES - - AppController - NSObject - - YES - - YES - exitFullScreen: - toggleFullScreen: - - - YES - id - id - - - - YES - - YES - exitFullScreen: - toggleFullScreen: - - - YES - - exitFullScreen: - id - - - toggleFullScreen: - id - - - - - YES - - YES - glView - window - - - YES - EAGLView - NSWindow - - - - YES - - YES - glView - window - - - YES - - glView - EAGLView - - - window - NSWindow - - - - - IBProjectSource - ./Classes/AppController.h - - - - EAGLView - NSOpenGLView - - IBProjectSource - ./Classes/EAGLView.h - - - - - 0 - IBCocoaFramework - - com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 - - - YES - 3 - - YES - - YES - NSMenuCheckmark - NSMenuMixedState - - - YES - {9, 8} - {7, 2} - - - - diff --git a/samples/Javascript/WatermelonWithMe/proj.mac/main.cpp b/samples/Javascript/WatermelonWithMe/proj.mac/main.cpp deleted file mode 100644 index b4bf804f38..0000000000 --- a/samples/Javascript/WatermelonWithMe/proj.mac/main.cpp +++ /dev/null @@ -1,37 +0,0 @@ -/**************************************************************************** - Copyright (c) 2010 cocos2d-x.org - - http://www.cocos2d-x.org - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - THE SOFTWARE. - ****************************************************************************/ - -#include "AppDelegate.h" -#include "cocos2d.h" - -USING_NS_CC; - -int main(int argc, char *argv[]) -{ - AppDelegate app; - EGLView eglView; - eglView.init("WatermelonWithMe",900,640); - return Application::getInstance()->run(); -} - diff --git a/samples/Javascript/WatermelonWithMe/proj.win32/WatermelonWithMe.vcxproj b/samples/Javascript/WatermelonWithMe/proj.win32/WatermelonWithMe.vcxproj deleted file mode 100644 index 0f76fa0e57..0000000000 --- a/samples/Javascript/WatermelonWithMe/proj.win32/WatermelonWithMe.vcxproj +++ /dev/null @@ -1,237 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {BE092D9E-95AE-4F86-84CE-F4519E4F3F15} - WatermelonWithMe - - - - Application - Unicode - v100 - v110 - v110_xp - - - Application - Unicode - v100 - v110 - v110_xp - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration).win32\ - $(Configuration).win32\ - false - $(SolutionDir)$(Configuration).win32\ - $(Configuration).win32\ - false - AllRules.ruleset - - - AllRules.ruleset - - - - - $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath) - - - $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath) - - - - _DEBUG;%(PreprocessorDefinitions) - false - Win32 - true - $(IntDir)testjs.tlb - testjs.h - - - testjs_i.c - testjs_p.c - - - Disabled - $(ProjectDir)..\Classes;$(EngineRoot);$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\scripting\auto-generated\js-bindings;$(EngineRoot)cocos\scripting\javascript\bindings;$(EngineRoot)cocos\audio\include;$(EngineRoot)external\spidermonkey\include\win32;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;%(AdditionalIncludeDirectories) - WIN32;_WINDOWS;STRICT;_DEBUG;DEBUG;XP_WIN;JS_HAVE___INTN;JS_INTPTR_TYPE=int;COCOS2D_DEBUG=1;COCOS2D_JAVASCRIPT=1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - false - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - 4267;4251;4244;%(DisableSpecificWarnings) - true - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(IntDir);%(AdditionalIncludeDirectories) - - - if not exist "$(OutDir)" mkdir "$(OutDir)" -xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\spidermonkey\prebuilt\win32\*.*" "$(OutDir)" - - - - libcurl_imp.lib;mozjs-25.0.lib;ws2_32.lib;sqlite3.lib;%(AdditionalDependencies) - $(OutDir);%(AdditionalLibraryDirectories) - true - Windows - MachineX86 - - - if not exist "$(OutDir)" mkdir "$(OutDir)" -if exist "$(OutDir)\WatermelonWithMeRes" rd /s /q "$(OutDir)\WatermelonWithMeRes" -mkdir "$(OutDir)\WatermelonWithMeRes" -xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\javascript\script\*.js" "$(OutDir)\WatermelonWithMeRes" /e /Y -xcopy "$(ProjectDir)..\..\Shared\games\WatermelonWithMe" "$(OutDir)\WatermelonWithMeRes\" /e /Y - - - Copy js and resource files. - - - - - NDEBUG;%(PreprocessorDefinitions) - false - Win32 - true - $(IntDir)testjs.tlb - testjs.h - - - testjs_i.c - testjs_p.c - - - $(ProjectDir)..\Classes;$(EngineRoot);$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\scripting\auto-generated\js-bindings;$(EngineRoot)cocos\scripting\javascript\bindings;$(EngineRoot)cocos\audio\include;$(EngineRoot)external\spidermonkey\include\win32;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;%(AdditionalIncludeDirectories) - WIN32;_WINDOWS;STRICT;NDEBUG;XP_WIN;JS_HAVE___INTN;JS_INTPTR_TYPE=int;COCOS2D_JAVASCRIPT=1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - - - MultiThreadedDLL - - - Level3 - - - 4267;4251;4244;%(DisableSpecificWarnings) - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(IntDir);%(AdditionalIncludeDirectories) - - - if not exist "$(OutDir)" mkdir "$(OutDir)" -xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\spidermonkey\prebuilt\win32\*.*" "$(OutDir)" - - - - libcurl_imp.lib;mozjs-25.0.lib;ws2_32.lib;sqlite3.lib;%(AdditionalDependencies) - $(OutDir);%(AdditionalLibraryDirectories) - Windows - MachineX86 - true - - - if not exist "$(OutDir)" mkdir "$(OutDir)" -if exist "$(OutDir)\WatermelonWithMeRes" rd /s /q "$(OutDir)\WatermelonWithMeRes" -mkdir "$(OutDir)\WatermelonWithMeRes" -xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\javascript\script\*.js" "$(OutDir)\WatermelonWithMeRes" /e /Y -xcopy "$(ProjectDir)..\..\Shared\games\WatermelonWithMe" "$(OutDir)\WatermelonWithMeRes\" /e /Y - Copy js and resource files. - - - - - - - - - - - - - - - - - - - - {98a51ba8-fc3a-415b-ac8f-8c7bd464e93e} - - - {f8edd7fa-9a51-4e80-baeb-860825d2eac6} - - - {811c0dab-7b96-4bd3-a154-b7572b58e4ab} - - - {b57cf53f-2e49-4031-9822-047cc0e6bde2} - - - {7e06e92c-537a-442b-9e4a-4761c84f8a1a} - - - {df2638c0-8128-4847-867c-6eafe3dee7b5} - - - {21070e58-eec6-4e16-8b4f-6d083df55790} - - - {f9da0fc1-651b-457b-962e-a4d61cebf5fd} - - - {625f7391-9a91-48a1-8cfc-79508c822637} - - - {68f5f371-bd7b-4c30-ae5b-0b08f22e0cde} - - - {39379840-825a-45a0-b363-c09ffef864bd} - - - {632a8f38-d0f0-4d22-86b3-d69f5e6bf63a} - - - {21b2c324-891f-48ea-ad1a-5ae13de12e28} - - - {207bc7a9-ccf1-4f2f-a04d-45f72242ae25} - - - - - - \ No newline at end of file diff --git a/samples/Javascript/WatermelonWithMe/proj.win32/WatermelonWithMe.vcxproj.filters b/samples/Javascript/WatermelonWithMe/proj.win32/WatermelonWithMe.vcxproj.filters deleted file mode 100644 index 56df37ce6f..0000000000 --- a/samples/Javascript/WatermelonWithMe/proj.win32/WatermelonWithMe.vcxproj.filters +++ /dev/null @@ -1,44 +0,0 @@ - - - - - {ca9c9e15-d942-43a1-aa7a-5f0b74ca1afd} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;jpg;jpeg;jpe;png;manifest - - - {ccb2323b-1cfa-41ea-bcf4-ba5f07309396} - - - {e93a77e1-af1e-4400-87d3-504b62ebdbb0} - - - - - win32 - - - Classes - - - - - win32 - - - win32 - - - Classes - - - - - resource - - - - - resource - - - \ No newline at end of file diff --git a/samples/Javascript/WatermelonWithMe/proj.win32/WatermelonWithMe.vcxproj.user b/samples/Javascript/WatermelonWithMe/proj.win32/WatermelonWithMe.vcxproj.user deleted file mode 100644 index 93f348ba68..0000000000 --- a/samples/Javascript/WatermelonWithMe/proj.win32/WatermelonWithMe.vcxproj.user +++ /dev/null @@ -1,11 +0,0 @@ - - - - $(OutDir)\WatermelonWithMeRes - WindowsLocalDebugger - - - $(OutDir)\WatermelonWithMeRes - WindowsLocalDebugger - - \ No newline at end of file diff --git a/samples/Javascript/WatermelonWithMe/proj.win32/main.cpp b/samples/Javascript/WatermelonWithMe/proj.win32/main.cpp deleted file mode 100644 index 3c69549eac..0000000000 --- a/samples/Javascript/WatermelonWithMe/proj.win32/main.cpp +++ /dev/null @@ -1,37 +0,0 @@ -#include "main.h" -#include "AppDelegate.h" -#include "CCEGLView.h" - -USING_NS_CC; - -// uncomment below line, open debug console -// #define USE_WIN32_CONSOLE - -int APIENTRY _tWinMain(HINSTANCE hInstance, - HINSTANCE hPrevInstance, - LPTSTR lpCmdLine, - int nCmdShow) -{ - UNREFERENCED_PARAMETER(hPrevInstance); - UNREFERENCED_PARAMETER(lpCmdLine); - -#ifdef USE_WIN32_CONSOLE - AllocConsole(); - freopen("CONIN$", "r", stdin); - freopen("CONOUT$", "w", stdout); - freopen("CONOUT$", "w", stderr); -#endif - - // create the application instance - AppDelegate app; - EGLView eglView; - eglView.init("WatermelonWithMe",900,640); - - int ret = Application::getInstance()->run(); - -#ifdef USE_WIN32_CONSOLE - FreeConsole(); -#endif - - return ret; -} diff --git a/samples/Javascript/WatermelonWithMe/proj.win32/main.h b/samples/Javascript/WatermelonWithMe/proj.win32/main.h deleted file mode 100644 index e29aeedb3a..0000000000 --- a/samples/Javascript/WatermelonWithMe/proj.win32/main.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef __MAIN_H__ -#define __MAIN_H__ - -#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers - -// Windows Header Files: -#include - -// C RunTime Header Files -#include "CCStdC.h" - -#endif // __WINMAIN_H__ diff --git a/samples/Javascript/WatermelonWithMe/proj.win32/res/testjs.ico b/samples/Javascript/WatermelonWithMe/proj.win32/res/testjs.ico deleted file mode 100644 index feaf932a7465e435af6271bd8204c0145731a6eb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 47629 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 - //CCScriptEngineManager::destroyInstance(); -} - -bool AppDelegate::applicationDidFinishLaunching() -{ - // initialize director - auto director = Director::getInstance(); - director->setOpenGLView(EGLView::getInstance()); - - EGLView::getInstance()->setDesignResolutionSize(480, 320, ResolutionPolicy::NO_BORDER); - - // turn on display FPS - director->setDisplayStats(true); - - // set FPS. the default value is 1.0/60 if you don't call this - director->setAnimationInterval(1.0 / 60); - - // register lua engine - LuaEngine* engine = LuaEngine::getInstance(); - ScriptEngineManager::getInstance()->setScriptEngine(engine); - - //The call was commented because it will lead to ZeroBrane Studio can't find correct context when debugging - //engine->executeScriptFile("hello.lua"); - engine->executeString("require 'hello.lua'"); - - return true; -} - -// This function will be called when the app is inactive. When comes a phone call,it's be invoked too -void AppDelegate::applicationDidEnterBackground() -{ - Director::getInstance()->stopAnimation(); - SimpleAudioEngine::getInstance()->pauseBackgroundMusic(); -} - -// this function will be called when the app is active again -void AppDelegate::applicationWillEnterForeground() -{ - Director::getInstance()->startAnimation(); - SimpleAudioEngine::getInstance()->resumeBackgroundMusic(); -} diff --git a/samples/Lua/HelloLua/Classes/AppDelegate.h b/samples/Lua/HelloLua/Classes/AppDelegate.h deleted file mode 100644 index b708f4bdca..0000000000 --- a/samples/Lua/HelloLua/Classes/AppDelegate.h +++ /dev/null @@ -1,38 +0,0 @@ -#ifndef _APP_DELEGATE_H_ -#define _APP_DELEGATE_H_ - -#include "CCApplication.h" - -/** -@brief The cocos2d Application. - -The reason for implement as private inheritance is to hide some interface call by Director. -*/ -class AppDelegate : private cocos2d::Application -{ -public: - AppDelegate(); - virtual ~AppDelegate(); - - /** - @brief Implement Director and Scene init code here. - @return true Initialize success, app continue. - @return false Initialize failed, app terminate. - */ - virtual bool applicationDidFinishLaunching(); - - /** - @brief The function be called when the application enter background - @param the pointer of the application - */ - virtual void applicationDidEnterBackground(); - - /** - @brief The function be called when the application enter foreground - @param the pointer of the application - */ - virtual void applicationWillEnterForeground(); -}; - -#endif // _APP_DELEGATE_H_ - diff --git a/samples/Lua/HelloLua/Resources/.gitignore b/samples/Lua/HelloLua/Resources/.gitignore deleted file mode 100644 index 1d65afe366..0000000000 --- a/samples/Lua/HelloLua/Resources/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -#Do now ignore Marmalade icf files -!*.icf diff --git a/samples/Lua/HelloLua/Resources/Resources/.gitignore b/samples/Lua/HelloLua/Resources/Resources/.gitignore deleted file mode 100644 index 1d65afe366..0000000000 --- a/samples/Lua/HelloLua/Resources/Resources/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -#Do now ignore Marmalade icf files -!*.icf diff --git a/samples/Lua/HelloLua/Resources/Resources/background.mp3.REMOVED.git-id b/samples/Lua/HelloLua/Resources/Resources/background.mp3.REMOVED.git-id deleted file mode 100644 index cfc16a8a4e..0000000000 --- a/samples/Lua/HelloLua/Resources/Resources/background.mp3.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -aec1c0a8c8068377fddca5ddd32084d8c3c3c419 \ No newline at end of file diff --git a/samples/Lua/HelloLua/Resources/background.mp3.REMOVED.git-id b/samples/Lua/HelloLua/Resources/background.mp3.REMOVED.git-id deleted file mode 100644 index cfc16a8a4e..0000000000 --- a/samples/Lua/HelloLua/Resources/background.mp3.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -aec1c0a8c8068377fddca5ddd32084d8c3c3c419 \ No newline at end of file diff --git a/samples/Lua/HelloLua/Resources/farm.jpg.REMOVED.git-id b/samples/Lua/HelloLua/Resources/farm.jpg.REMOVED.git-id deleted file mode 100644 index 4609f3cf02..0000000000 --- a/samples/Lua/HelloLua/Resources/farm.jpg.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -d7290c34702d1c6bdb368acb060d93b42d5deff8 \ No newline at end of file diff --git a/samples/Lua/HelloLua/Resources/hello.lua b/samples/Lua/HelloLua/Resources/hello.lua deleted file mode 100644 index 770e922c9d..0000000000 --- a/samples/Lua/HelloLua/Resources/hello.lua +++ /dev/null @@ -1,209 +0,0 @@ -require "Cocos2d" --- cclog -cclog = function(...) - print(string.format(...)) -end - --- for CCLuaEngine traceback -function __G__TRACKBACK__(msg) - cclog("----------------------------------------") - cclog("LUA ERROR: " .. tostring(msg) .. "\n") - cclog(debug.traceback()) - cclog("----------------------------------------") -end - -local function main() - -- avoid memory leak - collectgarbage("setpause", 100) - collectgarbage("setstepmul", 5000) - - --support debug - local targetPlatform = cc.Application:getInstance():getTargetPlatform() - if (cc.PLATFORM_OS_IPHONE == targetPlatform) or (cc.PLATFORM_OS_IPAD == targetPlatform) or - (cc.PLATFORM_OS_ANDROID == targetPlatform) or (cc.PLATFORM_OS_WINDOWS == targetPlatform) or - (cc.PLATFORM_OS_MAC == targetPlatform) then - local host = 'localhost' -- please change localhost to your PC's IP for on-device debugging - require('mobdebug').start(host) - end - require "hello2" - cclog("result is " .. myadd(1, 1)) - - --------------- - - local visibleSize = cc.Director:getInstance():getVisibleSize() - local origin = cc.Director:getInstance():getVisibleOrigin() - - -- add the moving dog - local function creatDog() - local frameWidth = 105 - local frameHeight = 95 - - -- create dog animate - local textureDog = cc.TextureCache:getInstance():addImage("dog.png") - local rect = cc.rect(0, 0, frameWidth, frameHeight) - local frame0 = cc.SpriteFrame:createWithTexture(textureDog, rect) - rect = cc.rect(frameWidth, 0, frameWidth, frameHeight) - local frame1 = cc.SpriteFrame:createWithTexture(textureDog, rect) - - local spriteDog = cc.Sprite:createWithSpriteFrame(frame0) - spriteDog.isPaused = false - spriteDog:setPosition(origin.x, origin.y + visibleSize.height / 4 * 3) ---[[ - local animFrames = CCArray:create() - - animFrames:addObject(frame0) - animFrames:addObject(frame1) -]]-- - - local animation = cc.Animation:createWithSpriteFrames({frame0,frame1}, 0.5) - local animate = cc.Animate:create(animation); - spriteDog:runAction(cc.RepeatForever:create(animate)) - - -- moving dog at every frame - local function tick() - if spriteDog.isPaused then return end - local x, y = spriteDog:getPosition() - if x > origin.x + visibleSize.width then - x = origin.x - else - x = x + 1 - end - - spriteDog:setPositionX(x) - end - - cc.Director:getInstance():getScheduler():scheduleScriptFunc(tick, 0, false) - - return spriteDog - end - - -- create farm - local function createLayerFarm() - local layerFarm = cc.Layer:create() - - -- add in farm background - local bg = cc.Sprite:create("farm.jpg") - bg:setPosition(origin.x + visibleSize.width / 2 + 80, origin.y + visibleSize.height / 2) - layerFarm:addChild(bg) - - -- add land sprite - for i = 0, 3 do - for j = 0, 1 do - local spriteLand = cc.Sprite:create("land.png") - spriteLand:setPosition(200 + j * 180 - i % 2 * 90, 10 + i * 95 / 2) - layerFarm:addChild(spriteLand) - end - end - - -- add crop - local frameCrop = cc.SpriteFrame:create("crop.png", cc.rect(0, 0, 105, 95)) - for i = 0, 3 do - for j = 0, 1 do - local spriteCrop = cc.Sprite:createWithSpriteFrame(frameCrop); - spriteCrop:setPosition(10 + 200 + j * 180 - i % 2 * 90, 30 + 10 + i * 95 / 2) - layerFarm:addChild(spriteCrop) - end - end - - -- add moving dog - local spriteDog = creatDog() - layerFarm:addChild(spriteDog) - - -- handing touch events - local touchBeginPoint = nil - local function onTouchBegan(touch, event) - local location = touch:getLocation() - cclog("onTouchBegan: %0.2f, %0.2f", location.x, location.y) - touchBeginPoint = {x = location.x, y = location.y} - spriteDog.isPaused = true - -- CCTOUCHBEGAN event must return true - return true - end - - local function onTouchMoved(touch, event) - local location = touch:getLocation() - cclog("onTouchMoved: %0.2f, %0.2f", location.x, location.y) - if touchBeginPoint then - local cx, cy = layerFarm:getPosition() - layerFarm:setPosition(cx + location.x - touchBeginPoint.x, - cy + location.y - touchBeginPoint.y) - touchBeginPoint = {x = location.x, y = location.y} - end - end - - local function onTouchEnded(touch, event) - local location = touch:getLocation() - cclog("onTouchEnded: %0.2f, %0.2f", location.x, location.y) - touchBeginPoint = nil - spriteDog.isPaused = false - end - - local listener = cc.EventListenerTouchOneByOne:create() - listener:registerScriptHandler(onTouchBegan,cc.Handler.EVENT_TOUCH_BEGAN ) - listener:registerScriptHandler(onTouchMoved,cc.Handler.EVENT_TOUCH_MOVED ) - listener:registerScriptHandler(onTouchEnded,cc.Handler.EVENT_TOUCH_ENDED ) - local eventDispatcher = layerFarm:getEventDispatcher() - eventDispatcher:addEventListenerWithSceneGraphPriority(listener, layerFarm) - - return layerFarm - end - - - -- create menu - local function createLayerMenu() - local layerMenu = cc.Layer:create() - - local menuPopup, menuTools, effectID - - local function menuCallbackClosePopup() - -- stop test sound effect - cc.SimpleAudioEngine:getInstance():stopEffect(effectID) - menuPopup:setVisible(false) - end - - local function menuCallbackOpenPopup() - -- loop test sound effect - local effectPath = cc.FileUtils:getInstance():fullPathForFilename("effect1.wav") - effectID = cc.SimpleAudioEngine:getInstance():playEffect(effectPath) - menuPopup:setVisible(true) - end - - -- add a popup menu - local menuPopupItem = cc.MenuItemImage:create("menu2.png", "menu2.png") - menuPopupItem:setPosition(0, 0) - menuPopupItem:registerScriptTapHandler(menuCallbackClosePopup) - menuPopup = cc.Menu:create(menuPopupItem) - menuPopup:setPosition(origin.x + visibleSize.width / 2, origin.y + visibleSize.height / 2) - menuPopup:setVisible(false) - layerMenu:addChild(menuPopup) - - -- add the left-bottom "tools" menu to invoke menuPopup - local menuToolsItem = cc.MenuItemImage:create("menu1.png", "menu1.png") - menuToolsItem:setPosition(0, 0) - menuToolsItem:registerScriptTapHandler(menuCallbackOpenPopup) - menuTools = cc.Menu:create(menuToolsItem) - local itemWidth = menuToolsItem:getContentSize().width - local itemHeight = menuToolsItem:getContentSize().height - menuTools:setPosition(origin.x + itemWidth/2, origin.y + itemHeight/2) - layerMenu:addChild(menuTools) - - return layerMenu - end - - -- play background music, preload effect - - -- uncomment below for the BlackBerry version - -- local bgMusicPath = CCFileUtils:getInstance():fullPathForFilename("background.ogg") - local bgMusicPath = cc.FileUtils:getInstance():fullPathForFilename("background.mp3") - cc.SimpleAudioEngine:getInstance():playMusic(bgMusicPath, true) - local effectPath = cc.FileUtils:getInstance():fullPathForFilename("effect1.wav") - cc.SimpleAudioEngine:getInstance():preloadEffect(effectPath) - - -- run - local sceneGame = cc.Scene:create() - sceneGame:addChild(createLayerFarm()) - sceneGame:addChild(createLayerMenu()) - cc.Director:getInstance():runWithScene(sceneGame) -end - -xpcall(main, __G__TRACKBACK__) diff --git a/samples/Lua/HelloLua/Resources/hello2.lua b/samples/Lua/HelloLua/Resources/hello2.lua deleted file mode 100644 index 27158aa788..0000000000 --- a/samples/Lua/HelloLua/Resources/hello2.lua +++ /dev/null @@ -1,3 +0,0 @@ -function myadd(x, y) - return x + y -end \ No newline at end of file diff --git a/samples/Lua/HelloLua/Resources/mobdebug.lua b/samples/Lua/HelloLua/Resources/mobdebug.lua deleted file mode 100644 index 31ef8af06b..0000000000 --- a/samples/Lua/HelloLua/Resources/mobdebug.lua +++ /dev/null @@ -1,1465 +0,0 @@ --- --- MobDebug 0.542 --- Copyright 2011-13 Paul Kulchenko --- Based on RemDebug 1.0 Copyright Kepler Project 2005 --- - -local mobdebug = { - _NAME = "mobdebug", - _VERSION = 0.542, - _COPYRIGHT = "Paul Kulchenko", - _DESCRIPTION = "Mobile Remote Debugger for the Lua programming language", - port = os and os.getenv and os.getenv("MOBDEBUG_PORT") or 8172, - checkcount = 200, - yieldtimeout = 0.02, -} - -local coroutine = coroutine -local error = error -local getfenv = getfenv -local setfenv = setfenv -local loadstring = loadstring or load -- "load" replaced "loadstring" in Lua 5.2 -local io = io -local os = os -local pairs = pairs -local require = require -local setmetatable = setmetatable -local string = string -local tonumber = tonumber -local unpack = table.unpack or unpack -local rawget = rawget - --- if strict.lua is used, then need to avoid referencing some global --- variables, as they can be undefined; --- use rawget to to avoid complaints from strict.lua at run-time. --- it's safe to do the initialization here as all these variables --- should get defined values (of any) before the debugging starts. --- there is also global 'wx' variable, which is checked as part of --- the debug loop as 'wx' can be loaded at any time during debugging. -local genv = _G or _ENV -local jit = rawget(genv, "jit") -local MOAICoroutine = rawget(genv, "MOAICoroutine") - -if not setfenv then -- Lua 5.2 - -- based on http://lua-users.org/lists/lua-l/2010-06/msg00314.html - -- this assumes f is a function - local function findenv(f) - local level = 1 - repeat - local name, value = debug.getupvalue(f, level) - if name == '_ENV' then return level, value end - level = level + 1 - until name == nil - return nil end - getfenv = function (f) return(select(2, findenv(f)) or _G) end - setfenv = function (f, t) - local level = findenv(f) - if level then debug.setupvalue(f, level, t) end - return f end -end - --- check for OS and convert file names to lower case on windows --- (its file system is case insensitive, but case preserving), as setting a --- breakpoint on x:\Foo.lua will not work if the file was loaded as X:\foo.lua. --- OSX and Windows behave the same way (case insensitive, but case preserving) -local iscasepreserving = os and os.getenv and (os.getenv('WINDIR') - or (os.getenv('OS') or ''):match('[Ww]indows') - or os.getenv('DYLD_LIBRARY_PATH')) - or not io.open("/proc") - --- turn jit off based on Mike Pall's comment in this discussion: --- http://www.freelists.org/post/luajit/Debug-hooks-and-JIT,2 --- "You need to turn it off at the start if you plan to receive --- reliable hook calls at any later point in time." -if jit and jit.off then jit.off() end - -local socket = require "socket" -local debug = require "debug" -local coro_debugger -local coro_debugee -local coroutines = {}; setmetatable(coroutines, {__mode = "k"}) -- "weak" keys -local events = { BREAK = 1, WATCH = 2, RESTART = 3, STACK = 4 } -local breakpoints = {} -local watches = {} -local lastsource -local lastfile -local watchescnt = 0 -local abort -- default value is nil; this is used in start/loop distinction -local seen_hook = false -local checkcount = 0 -local step_into = false -local step_over = false -local step_level = 0 -local stack_level = 0 -local server -local buf -local outputs = {} -local iobase = {print = print} -local basedir = "" -local deferror = "execution aborted at default debugee" -local debugee = function () - local a = 1 - for _ = 1, 10 do a = a + 1 end - error(deferror) -end -local function q(s) return s:gsub('([%(%)%.%%%+%-%*%?%[%^%$%]])','%%%1') end - -local serpent = (function() ---- include Serpent module for serialization -local n, v = "serpent", 0.25 -- (C) 2012-13 Paul Kulchenko; MIT License -local c, d = "Paul Kulchenko", "Lua serializer and pretty printer" -local snum = {[tostring(1/0)]='1/0 --[[math.huge]]',[tostring(-1/0)]='-1/0 --[[-math.huge]]',[tostring(0/0)]='0/0'} -local badtype = {thread = true, userdata = true, cdata = true} -local keyword, globals, G = {}, {}, (_G or _ENV) -for _,k in ipairs({'and', 'break', 'do', 'else', 'elseif', 'end', 'false', - 'for', 'function', 'goto', 'if', 'in', 'local', 'nil', 'not', 'or', 'repeat', - 'return', 'then', 'true', 'until', 'while'}) do keyword[k] = true end -for k,v in pairs(G) do globals[v] = k end -- build func to name mapping -for _,g in ipairs({'coroutine', 'debug', 'io', 'math', 'string', 'table', 'os'}) do - for k,v in pairs(G[g]) do globals[v] = g..'.'..k end end - -local function s(t, opts) - local name, indent, fatal, maxnum = opts.name, opts.indent, opts.fatal, opts.maxnum - local sparse, custom, huge = opts.sparse, opts.custom, not opts.nohuge - local space, maxl = (opts.compact and '' or ' '), (opts.maxlevel or math.huge) - local iname, comm = '_'..(name or ''), opts.comment and (tonumber(opts.comment) or math.huge) - local seen, sref, syms, symn = {}, {'local '..iname..'={}'}, {}, 0 - local function gensym(val) return '_'..(tostring(tostring(val)):gsub("[^%w]",""):gsub("(%d%w+)", - -- tostring(val) is needed because __tostring may return a non-string value - function(s) if not syms[s] then symn = symn+1; syms[s] = symn end return syms[s] end)) end - local function safestr(s) return type(s) == "number" and (huge and snum[tostring(s)] or s) - or type(s) ~= "string" and tostring(s) -- escape NEWLINE/010 and EOF/026 - or ("%q"):format(s):gsub("\010","n"):gsub("\026","\\026") end - local function comment(s,l) return comm and (l or 0) < comm and ' --[['..tostring(s)..']]' or '' end - local function globerr(s,l) return globals[s] and globals[s]..comment(s,l) or not fatal - and safestr(select(2, pcall(tostring, s))) or error("Can't serialize "..tostring(s)) end - local function safename(path, name) -- generates foo.bar, foo[3], or foo['b a r'] - local n = name == nil and '' or name - local plain = type(n) == "string" and n:match("^[%l%u_][%w_]*$") and not keyword[n] - local safe = plain and n or '['..safestr(n)..']' - return (path or '')..(plain and path and '.' or '')..safe, safe end - local alphanumsort = type(opts.sortkeys) == 'function' and opts.sortkeys or function(k, o, n) -- k=keys, o=originaltable, n=padding - local maxn, to = tonumber(n) or 12, {number = 'a', string = 'b'} - local function padnum(d) return ("%0"..maxn.."d"):format(d) end - table.sort(k, function(a,b) - -- sort numeric keys first: k[key] is non-nil for numeric keys - return (k[a] and 0 or to[type(a)] or 'z')..(tostring(a):gsub("%d+",padnum)) - < (k[b] and 0 or to[type(b)] or 'z')..(tostring(b):gsub("%d+",padnum)) end) end - local function val2str(t, name, indent, insref, path, plainindex, level) - local ttype, level, mt = type(t), (level or 0), getmetatable(t) - local spath, sname = safename(path, name) - local tag = plainindex and - ((type(name) == "number") and '' or name..space..'='..space) or - (name ~= nil and sname..space..'='..space or '') - if seen[t] then -- already seen this element - sref[#sref+1] = spath..space..'='..space..seen[t] - return tag..'nil'..comment('ref', level) end - if type(mt) == 'table' and (mt.__serialize or mt.__tostring) then -- knows how to serialize itself - seen[t] = insref or spath - if mt.__serialize then t = mt.__serialize(t) else t = tostring(t) end - ttype = type(t) end -- new value falls through to be serialized - if ttype == "table" then - if level >= maxl then return tag..'{}'..comment('max', level) end - seen[t] = insref or spath - if next(t) == nil then return tag..'{}'..comment(t, level) end -- table empty - local maxn, o, out = math.min(#t, maxnum or #t), {}, {} - for key = 1, maxn do o[key] = key end - if not maxnum or #o < maxnum then - local n = #o -- n = n + 1; o[n] is much faster than o[#o+1] on large tables - for key in pairs(t) do if o[key] ~= key then n = n + 1; o[n] = key end end end - if maxnum and #o > maxnum then o[maxnum+1] = nil end - if opts.sortkeys and #o > maxn then alphanumsort(o, t, opts.sortkeys) end - local sparse = sparse and #o > maxn -- disable sparsness if only numeric keys (shorter output) - for n, key in ipairs(o) do - local value, ktype, plainindex = t[key], type(key), n <= maxn and not sparse - if opts.valignore and opts.valignore[value] -- skip ignored values; do nothing - or opts.keyallow and not opts.keyallow[key] - or opts.valtypeignore and opts.valtypeignore[type(value)] -- skipping ignored value types - or sparse and value == nil then -- skipping nils; do nothing - elseif ktype == 'table' or ktype == 'function' or badtype[ktype] then - if not seen[key] and not globals[key] then - sref[#sref+1] = 'placeholder' - local sname = safename(iname, gensym(key)) -- iname is table for local variables - sref[#sref] = val2str(key,sname,indent,sname,iname,true) end - sref[#sref+1] = 'placeholder' - local path = seen[t]..'['..(seen[key] or globals[key] or gensym(key))..']' - sref[#sref] = path..space..'='..space..(seen[value] or val2str(value,nil,indent,path)) - else - out[#out+1] = val2str(value,key,indent,insref,seen[t],plainindex,level+1) - end - end - local prefix = string.rep(indent or '', level) - local head = indent and '{\n'..prefix..indent or '{' - local body = table.concat(out, ','..(indent and '\n'..prefix..indent or space)) - local tail = indent and "\n"..prefix..'}' or '}' - return (custom and custom(tag,head,body,tail) or tag..head..body..tail)..comment(t, level) - elseif badtype[ttype] then - seen[t] = insref or spath - return tag..globerr(t, level) - elseif ttype == 'function' then - seen[t] = insref or spath - local ok, res = pcall(string.dump, t) - local func = ok and ((opts.nocode and "function() --[[..skipped..]] end" or - "loadstring("..safestr(res)..",'@serialized')")..comment(t, level)) - return tag..(func or globerr(t, level)) - else return tag..safestr(t) end -- handle all other types - end - local sepr = indent and "\n" or ";"..space - local body = val2str(t, name, indent) -- this call also populates sref - local tail = #sref>1 and table.concat(sref, sepr)..sepr or '' - local warn = opts.comment and #sref>1 and space.."--[[incomplete output with shared/self-references skipped]]" or '' - return not name and body..warn or "do local "..body..sepr..tail.."return "..name..sepr.."end" -end - -local function merge(a, b) if b then for k,v in pairs(b) do a[k] = v end end; return a; end -return { _NAME = n, _COPYRIGHT = c, _DESCRIPTION = d, _VERSION = v, serialize = s, - dump = function(a, opts) return s(a, merge({name = '_', compact = true, sparse = true}, opts)) end, - line = function(a, opts) return s(a, merge({sortkeys = true, comment = true}, opts)) end, - block = function(a, opts) return s(a, merge({indent = ' ', sortkeys = true, comment = true}, opts)) end } -end)() ---- end of Serpent module - -local function removebasedir(path, basedir) - if iscasepreserving then - -- check if the lowercased path matches the basedir - -- if so, return substring of the original path (to not lowercase it) - return path:lower():find('^'..q(basedir:lower())) - and path:sub(#basedir+1) or path - else - return string.gsub(path, '^'..q(basedir), '') - end -end - -local function stack(start) - local function vars(f) - local func = debug.getinfo(f, "f").func - local i = 1 - local locals = {} - while true do - local name, value = debug.getlocal(f, i) - if not name then break end - if string.sub(name, 1, 1) ~= '(' then locals[name] = {value, tostring(value)} end - i = i + 1 - end - i = 1 - local ups = {} - while func and true do -- check for func as it may be nil for tail calls - local name, value = debug.getupvalue(func, i) - if not name then break end - ups[name] = {value, tostring(value)} - i = i + 1 - end - return locals, ups - end - - local stack = {} - for i = (start or 0), 100 do - local source = debug.getinfo(i, "Snl") - if not source then break end - - local src = source.source - if src:find("@") == 1 then - src = src:sub(2):gsub("\\", "/") - if src:find("%./") == 1 then src = src:sub(3) end - end - - table.insert(stack, { -- remove basedir from source - {source.name, removebasedir(src, basedir), source.linedefined, - source.currentline, source.what, source.namewhat, source.short_src}, - vars(i+1)}) - if source.what == 'main' then break end - end - return stack -end - -local function set_breakpoint(file, line) - if file == '-' and lastfile then file = lastfile - elseif iscasepreserving then file = string.lower(file) end - if not breakpoints[line] then breakpoints[line] = {} end - breakpoints[line][file] = true -end - -local function remove_breakpoint(file, line) - if file == '-' and lastfile then file = lastfile - elseif iscasepreserving then file = string.lower(file) end - if breakpoints[line] then breakpoints[line][file] = nil end -end - -local function has_breakpoint(file, line) - return breakpoints[line] - and breakpoints[line][iscasepreserving and string.lower(file) or file] -end - -local function restore_vars(vars) - if type(vars) ~= 'table' then return end - - -- locals need to be processed in the reverse order, starting from - -- the inner block out, to make sure that the localized variables - -- are correctly updated with only the closest variable with - -- the same name being changed - -- first loop find how many local variables there is, while - -- the second loop processes them from i to 1 - local i = 1 - while true do - local name = debug.getlocal(3, i) - if not name then break end - i = i + 1 - end - i = i - 1 - local written_vars = {} - while i > 0 do - local name = debug.getlocal(3, i) - if not written_vars[name] then - if string.sub(name, 1, 1) ~= '(' then - debug.setlocal(3, i, rawget(vars, name)) - end - written_vars[name] = true - end - i = i - 1 - end - - i = 1 - local func = debug.getinfo(3, "f").func - while true do - local name = debug.getupvalue(func, i) - if not name then break end - if not written_vars[name] then - if string.sub(name, 1, 1) ~= '(' then - debug.setupvalue(func, i, rawget(vars, name)) - end - written_vars[name] = true - end - i = i + 1 - end -end - -local function capture_vars(level) - local vars = {} - local func = debug.getinfo(level or 3, "f").func - local i = 1 - while true do - local name, value = debug.getupvalue(func, i) - if not name then break end - if string.sub(name, 1, 1) ~= '(' then vars[name] = value end - i = i + 1 - end - i = 1 - while true do - local name, value = debug.getlocal(level or 3, i) - if not name then break end - if string.sub(name, 1, 1) ~= '(' then vars[name] = value end - i = i + 1 - end - -- returned 'vars' table plays a dual role: (1) it captures local values - -- and upvalues to be restored later (in case they are modified in "eval"), - -- and (2) it provides an environment for evaluated chunks. - -- getfenv(func) is needed to provide proper environment for functions, - -- including access to globals, but this causes vars[name] to fail in - -- restore_vars on local variables or upvalues with `nil` values when - -- 'strict' is in effect. To avoid this `rawget` is used in restore_vars. - setmetatable(vars, { __index = getfenv(func), __newindex = getfenv(func) }) - return vars -end - -local function stack_depth(start_depth) - for i = start_depth, 0, -1 do - if debug.getinfo(i, "l") then return i+1 end - end - return start_depth -end - -local function is_safe(stack_level) - -- the stack grows up: 0 is getinfo, 1 is is_safe, 2 is debug_hook, 3 is user function - if stack_level == 3 then return true end - for i = 3, stack_level do - -- return if it is not safe to abort - local info = debug.getinfo(i, "S") - if not info then return true end - if info.what == "C" then return false end - end - return true -end - -local function in_debugger() - local this = debug.getinfo(1, "S").source - -- only need to check few frames as mobdebug frames should be close - for i = 3, 7 do - local info = debug.getinfo(i, "S") - if not info then return false end - if info.source == this then return true end - end - return false -end - -local function is_pending(peer) - -- if there is something already in the buffer, skip check - if not buf and checkcount >= mobdebug.checkcount then - peer:settimeout(0) -- non-blocking - buf = peer:receive(1) - peer:settimeout() -- back to blocking - checkcount = 0 - end - return buf -end - -local function debug_hook(event, line) - -- (1) LuaJIT needs special treatment. Because debug_hook is set for - -- *all* coroutines, and not just the one being debugged as in regular Lua - -- (http://lua-users.org/lists/lua-l/2011-06/msg00513.html), - -- need to avoid debugging mobdebug's own code as LuaJIT doesn't - -- always correctly generate call/return hook events (there are more - -- calls than returns, which breaks stack depth calculation and - -- 'step' and 'step over' commands stop working; possibly because - -- 'tail return' events are not generated by LuaJIT). - -- the next line checks if the debugger is run under LuaJIT and if - -- one of debugger methods is present in the stack, it simply returns. - if jit then - -- when luajit is compiled with LUAJIT_ENABLE_LUA52COMPAT, - -- coroutine.running() returns non-nil for the main thread. - local coro, main = coroutine.running() - if not coro or main then coro = 'main' end - local disabled = coroutines[coro] == false - or coroutines[coro] == nil and coro ~= (coro_debugee or 'main') - if coro_debugee and disabled or not coro_debugee and (disabled or in_debugger()) - then return end - end - - -- (2) check if abort has been requested and it's safe to abort - if abort and is_safe(stack_level) then error(abort) end - - -- (3) also check if this debug hook has not been visited for any reason. - -- this check is needed to avoid stepping in too early - -- (for example, when coroutine.resume() is executed inside start()). - if not seen_hook and in_debugger() then return end - - if event == "call" then - stack_level = stack_level + 1 - elseif event == "return" or event == "tail return" then - stack_level = stack_level - 1 - elseif event == "line" then - -- may need to fall through because of the following: - -- (1) step_into - -- (2) step_over and stack_level <= step_level (need stack_level) - -- (3) breakpoint; check for line first as it's known; then for file - -- (4) socket call (only do every Xth check) - -- (5) at least one watch is registered - if not ( - step_into or step_over or breakpoints[line] or watchescnt > 0 - or is_pending(server) - ) then checkcount = checkcount + 1; return end - - checkcount = mobdebug.checkcount -- force check on the next command - - -- this is needed to check if the stack got shorter or longer. - -- unfortunately counting call/return calls is not reliable. - -- the discrepancy may happen when "pcall(load, '')" call is made - -- or when "error()" is called in a function. - -- in either case there are more "call" than "return" events reported. - -- this validation is done for every "line" event, but should be "cheap" - -- as it checks for the stack to get shorter (or longer by one call). - -- start from one level higher just in case we need to grow the stack. - -- this may happen after coroutine.resume call to a function that doesn't - -- have any other instructions to execute. it triggers three returns: - -- "return, tail return, return", which needs to be accounted for. - stack_level = stack_depth(stack_level+1) - - local caller = debug.getinfo(2, "S") - - -- grab the filename and fix it if needed - local file = lastfile - if (lastsource ~= caller.source) then - file, lastsource = caller.source, caller.source - -- technically, users can supply names that may not use '@', - -- for example when they call loadstring('...', 'filename.lua'). - -- Unfortunately, there is no reliable/quick way to figure out - -- what is the filename and what is the source code. - -- The following will work if the supplied filename uses Unix path. - if file:find("^@") then - file = file:gsub("^@", ""):gsub("\\", "/") - -- need this conversion to be applied to relative and absolute - -- file names as you may write "require 'Foo'" to - -- load "foo.lua" (on a case insensitive file system) and breakpoints - -- set on foo.lua will not work if not converted to the same case. - if iscasepreserving then file = string.lower(file) end - if file:find("%./") == 1 then file = file:sub(3) - else file = file:gsub('^'..q(basedir), '') end - -- some file systems allow newlines in file names; remove these. - file = file:gsub("\n", ' ') - else - -- this is either a file name coming from loadstring("chunk", "file"), - -- or the actual source code that needs to be serialized (as it may - -- include newlines); assume it's a file name if it's all on one line. - file = file:find("[\r\n]") and serpent.line(file) or file - end - - -- set to true if we got here; this only needs to be done once per - -- session, so do it here to at least avoid setting it for every line. - seen_hook = true - lastfile = file - end - - local vars, status, res - if (watchescnt > 0) then - vars = capture_vars() - for index, value in pairs(watches) do - setfenv(value, vars) - local ok, fired = pcall(value) - if ok and fired then - status, res = coroutine.resume(coro_debugger, events.WATCH, vars, file, line, index) - break -- any one watch is enough; don't check multiple times - end - end - end - - -- need to get into the "regular" debug handler, but only if there was - -- no watch that was fired. If there was a watch, handle its result. - local getin = (status == nil) and - (step_into - or (step_over and stack_level <= step_level) - or has_breakpoint(file, line) - or is_pending(server)) - - if getin then - vars = vars or capture_vars() - step_into = false - step_over = false - status, res = coroutine.resume(coro_debugger, events.BREAK, vars, file, line) - end - - -- handle 'stack' command that provides stack() information to the debugger - if status and res == 'stack' then - while status and res == 'stack' do - -- resume with the stack trace and variables - if vars then restore_vars(vars) end -- restore vars so they are reflected in stack values - -- this may fail if __tostring method fails at run-time - local ok, snapshot = pcall(stack, 4) - status, res = coroutine.resume(coro_debugger, ok and events.STACK or events.BREAK, snapshot, file, line) - end - end - - -- need to recheck once more as resume after 'stack' command may - -- return something else (for example, 'exit'), which needs to be handled - if status and res and res ~= 'stack' then - if abort == nil and res == "exit" then os.exit(1); return end - abort = res - -- only abort if safe; if not, there is another (earlier) check inside - -- debug_hook, which will abort execution at the first safe opportunity - if is_safe(stack_level) then error(abort) end - elseif not status and res then - error(res, 2) -- report any other (internal) errors back to the application - end - - if vars then restore_vars(vars) end - end -end - -local function stringify_results(status, ...) - if not status then return status, ... end -- on error report as it - - local t = {...} - for i,v in pairs(t) do -- stringify each of the returned values - local ok, res = pcall(serpent.line, v, {nocode = true, comment = 1}) - t[i] = ok and res or ("%q"):format(res):gsub("\010","n"):gsub("\026","\\026") - end - -- stringify table with all returned values - -- this is done to allow each returned value to be used (serialized or not) - -- intependently and to preserve "original" comments - return pcall(serpent.dump, t, {sparse = false}) -end - -local function debugger_loop(sev, svars, sfile, sline) - local command - local app, osname - local eval_env = svars or {} - local function emptyWatch () return false end - local loaded = {} - for k in pairs(package.loaded) do loaded[k] = true end - - while true do - local line, err - local wx = rawget(genv, "wx") -- use rawread to make strict.lua happy - if (wx or mobdebug.yield) and server.settimeout then server:settimeout(mobdebug.yieldtimeout) end - while true do - line, err = server:receive() - if not line and err == "timeout" then - -- yield for wx GUI applications if possible to avoid "busyness" - app = app or (wx and wx.wxGetApp and wx.wxGetApp()) - if app then - local win = app:GetTopWindow() - local inloop = app:IsMainLoopRunning() - osname = osname or wx.wxPlatformInfo.Get():GetOperatingSystemFamilyName() - if win and not inloop then - -- process messages in a regular way - -- and exit as soon as the event loop is idle - if osname == 'Unix' then wx.wxTimer(app):Start(10, true) end - local exitLoop = function() - win:Disconnect(wx.wxID_ANY, wx.wxID_ANY, wx.wxEVT_IDLE) - win:Disconnect(wx.wxID_ANY, wx.wxID_ANY, wx.wxEVT_TIMER) - app:ExitMainLoop() - end - win:Connect(wx.wxEVT_IDLE, exitLoop) - win:Connect(wx.wxEVT_TIMER, exitLoop) - app:MainLoop() - end - elseif mobdebug.yield then mobdebug.yield() - end - elseif not line and err == "closed" then - error("Debugger connection unexpectedly closed", 0) - else - -- if there is something in the pending buffer, prepend it to the line - if buf then line = buf .. line; buf = nil end - break - end - end - if server.settimeout then server:settimeout() end -- back to blocking - command = string.sub(line, string.find(line, "^[A-Z]+")) - if command == "SETB" then - local _, _, _, file, line = string.find(line, "^([A-Z]+)%s+(.-)%s+(%d+)%s*$") - if file and line then - set_breakpoint(file, tonumber(line)) - server:send("200 OK\n") - else - server:send("400 Bad Request\n") - end - elseif command == "DELB" then - local _, _, _, file, line = string.find(line, "^([A-Z]+)%s+(.-)%s+(%d+)%s*$") - if file and line then - remove_breakpoint(file, tonumber(line)) - server:send("200 OK\n") - else - server:send("400 Bad Request\n") - end - elseif command == "EXEC" then - local _, _, chunk = string.find(line, "^[A-Z]+%s+(.+)$") - if chunk then - local func, res = loadstring(chunk) - local status - if func then - setfenv(func, eval_env) - status, res = stringify_results(pcall(func)) - end - if status then - server:send("200 OK " .. #res .. "\n") - server:send(res) - else - server:send("401 Error in Expression " .. #res .. "\n") - server:send(res) - end - else - server:send("400 Bad Request\n") - end - elseif command == "LOAD" then - local _, _, size, name = string.find(line, "^[A-Z]+%s+(%d+)%s+(%S.-)%s*$") - size = tonumber(size) - - if abort == nil then -- no LOAD/RELOAD allowed inside start() - if size > 0 then server:receive(size) end - if sfile and sline then - server:send("201 Started " .. sfile .. " " .. sline .. "\n") - else - server:send("200 OK 0\n") - end - else - -- reset environment to allow required modules to load again - -- remove those packages that weren't loaded when debugger started - for k in pairs(package.loaded) do - if not loaded[k] then package.loaded[k] = nil end - end - - if size == 0 and name == '-' then -- RELOAD the current script being debugged - server:send("200 OK 0\n") - coroutine.yield("load") - else - -- receiving 0 bytes blocks (at least in luasocket 2.0.2), so skip reading - local chunk = size == 0 and "" or server:receive(size) - if chunk then -- LOAD a new script for debugging - local func, res = loadstring(chunk, "@"..name) - if func then - server:send("200 OK 0\n") - debugee = func - coroutine.yield("load") - else - server:send("401 Error in Expression " .. #res .. "\n") - server:send(res) - end - else - server:send("400 Bad Request\n") - end - end - end - elseif command == "SETW" then - local _, _, exp = string.find(line, "^[A-Z]+%s+(.+)%s*$") - if exp then - local func, res = loadstring("return(" .. exp .. ")") - if func then - watchescnt = watchescnt + 1 - local newidx = #watches + 1 - watches[newidx] = func - server:send("200 OK " .. newidx .. "\n") - else - server:send("401 Error in Expression " .. #res .. "\n") - server:send(res) - end - else - server:send("400 Bad Request\n") - end - elseif command == "DELW" then - local _, _, index = string.find(line, "^[A-Z]+%s+(%d+)%s*$") - index = tonumber(index) - if index > 0 and index <= #watches then - watchescnt = watchescnt - (watches[index] ~= emptyWatch and 1 or 0) - watches[index] = emptyWatch - server:send("200 OK\n") - else - server:send("400 Bad Request\n") - end - elseif command == "RUN" then - server:send("200 OK\n") - - local ev, vars, file, line, idx_watch = coroutine.yield() - eval_env = vars - if ev == events.BREAK then - server:send("202 Paused " .. file .. " " .. line .. "\n") - elseif ev == events.WATCH then - server:send("203 Paused " .. file .. " " .. line .. " " .. idx_watch .. "\n") - elseif ev == events.RESTART then - -- nothing to do - else - server:send("401 Error in Execution " .. #file .. "\n") - server:send(file) - end - elseif command == "STEP" then - server:send("200 OK\n") - step_into = true - - local ev, vars, file, line, idx_watch = coroutine.yield() - eval_env = vars - if ev == events.BREAK then - server:send("202 Paused " .. file .. " " .. line .. "\n") - elseif ev == events.WATCH then - server:send("203 Paused " .. file .. " " .. line .. " " .. idx_watch .. "\n") - elseif ev == events.RESTART then - -- nothing to do - else - server:send("401 Error in Execution " .. #file .. "\n") - server:send(file) - end - elseif command == "OVER" or command == "OUT" then - server:send("200 OK\n") - step_over = true - - -- OVER and OUT are very similar except for - -- the stack level value at which to stop - if command == "OUT" then step_level = stack_level - 1 - else step_level = stack_level end - - local ev, vars, file, line, idx_watch = coroutine.yield() - eval_env = vars - if ev == events.BREAK then - server:send("202 Paused " .. file .. " " .. line .. "\n") - elseif ev == events.WATCH then - server:send("203 Paused " .. file .. " " .. line .. " " .. idx_watch .. "\n") - elseif ev == events.RESTART then - -- nothing to do - else - server:send("401 Error in Execution " .. #file .. "\n") - server:send(file) - end - elseif command == "BASEDIR" then - local _, _, dir = string.find(line, "^[A-Z]+%s+(.+)%s*$") - if dir then - basedir = iscasepreserving and string.lower(dir) or dir - -- reset cached source as it may change with basedir - lastsource = nil - server:send("200 OK\n") - else - server:send("400 Bad Request\n") - end - elseif command == "SUSPEND" then - -- do nothing; it already fulfilled its role - elseif command == "STACK" then - -- first check if we can execute the stack command - -- as it requires yielding back to debug_hook it cannot be executed - -- if we have not seen the hook yet as happens after start(). - -- in this case we simply return an empty result - local vars, ev = {} - if seen_hook then - ev, vars = coroutine.yield("stack") - end - if ev and ev ~= events.STACK then - server:send("401 Error in Execution " .. #vars .. "\n") - server:send(vars) - else - local ok, res = pcall(serpent.dump, vars, {nocode = true, sparse = false}) - if ok then - server:send("200 OK " .. res .. "\n") - else - server:send("401 Error in Execution " .. #res .. "\n") - server:send(res) - end - end - elseif command == "OUTPUT" then - local _, _, stream, mode = string.find(line, "^[A-Z]+%s+(%w+)%s+([dcr])%s*$") - if stream and mode and stream == "stdout" then - -- assign "print" in the global environment - genv.print = mode == 'd' and iobase.print or coroutine.wrap(function(...) - -- wrapping into coroutine.wrap protects this function from - -- being stepped through in the debugger - local tbl = {...} - while true do - if mode == 'c' then iobase.print(unpack(tbl)) end - for n = 1, #tbl do - tbl[n] = select(2, pcall(serpent.line, tbl[n], {nocode = true, comment = false})) end - local file = table.concat(tbl, "\t").."\n" - server:send("204 Output " .. stream .. " " .. #file .. "\n" .. file) - tbl = {coroutine.yield()} - end - end) - server:send("200 OK\n") - else - server:send("400 Bad Request\n") - end - elseif command == "EXIT" then - server:send("200 OK\n") - coroutine.yield("exit") - else - server:send("400 Bad Request\n") - end - end -end - -local function connect(controller_host, controller_port) - return (socket.connect4 or socket.connect)(controller_host, controller_port) -end - -local function isrunning() - return coro_debugger and coroutine.status(coro_debugger) == 'suspended' -end - -local lasthost, lastport - --- Starts a debug session by connecting to a controller -local function start(controller_host, controller_port) - -- only one debugging session can be run (as there is only one debug hook) - if isrunning() then return end - - lasthost = controller_host or lasthost - lastport = controller_port or lastport - - controller_host = lasthost or "localhost" - controller_port = lastport or mobdebug.port - - local err - server, err = (socket.connect4 or socket.connect)(controller_host, controller_port) - if server then - -- correct stack depth which already has some calls on it - -- so it doesn't go into negative when those calls return - -- as this breaks subsequence checks in stack_depth(). - -- start from 16th frame, which is sufficiently large for this check. - stack_level = stack_depth(16) - - -- provide our own traceback function to report the error remotely - do - local dtraceback = debug.traceback - debug.traceback = function (...) - if select('#', ...) >= 1 then - local err, lvl = ... - if err and type(err) ~= 'thread' then - local trace = dtraceback(err, (lvl or 2)+1) - if genv.print == iobase.print then -- no remote redirect - return trace - else - genv.print(trace) -- report the error remotely - return -- don't report locally to avoid double reporting - end - end - end - -- direct call to debug.traceback: return the original. - -- debug.traceback(nil, level) doesn't work in Lua 5.1 - -- (http://lua-users.org/lists/lua-l/2011-06/msg00574.html), so - -- simply remove first frame from the stack trace - return (dtraceback(...):gsub("(stack traceback:\n)[^\n]*\n", "%1")) - end - end - coro_debugger = coroutine.create(debugger_loop) - debug.sethook(debug_hook, "lcr") - seen_hook = nil -- reset in case the last start() call was refused - step_into = true -- start with step command - return true - else - print(("Could not connect to %s:%s: %s") - :format(controller_host, controller_port, err or "unknown error")) - end -end - -local function controller(controller_host, controller_port, scratchpad) - -- only one debugging session can be run (as there is only one debug hook) - if isrunning() then return end - - lasthost = controller_host or lasthost - lastport = controller_port or lastport - - controller_host = lasthost or "localhost" - controller_port = lastport or mobdebug.port - - local exitonerror = not scratchpad - local err - server, err = (socket.connect4 or socket.connect)(controller_host, controller_port) - if server then - local function report(trace, err) - local msg = err .. "\n" .. trace - server:send("401 Error in Execution " .. #msg .. "\n") - server:send(msg) - return err - end - - seen_hook = true -- allow to accept all commands - coro_debugger = coroutine.create(debugger_loop) - - while true do - step_into = true -- start with step command - abort = false -- reset abort flag from the previous loop - if scratchpad then checkcount = mobdebug.checkcount end -- force suspend right away - - coro_debugee = coroutine.create(debugee) - debug.sethook(coro_debugee, debug_hook, "lcr") - local status, err = coroutine.resume(coro_debugee) - - -- was there an error or is the script done? - -- 'abort' state is allowed here; ignore it - if abort then - if tostring(abort) == 'exit' then break end - else - if status then -- normal execution is done - break - elseif err and not tostring(err):find(deferror) then - -- report the error back - -- err is not necessarily a string, so convert to string to report - report(debug.traceback(coro_debugee), tostring(err)) - if exitonerror then break end - -- resume once more to clear the response the debugger wants to send - -- need to use capture_vars(2) as three would be the level of - -- the caller for controller(), but because of the tail call, - -- the caller may not exist; - -- This is not entirely safe as the user may see the local - -- variable from console, but they will be reset anyway. - -- This functionality is used when scratchpad is paused to - -- gain access to remote console to modify global variables. - local status, err = coroutine.resume(coro_debugger, events.RESTART, capture_vars(2)) - if not status or status and err == "exit" then break end - end - end - end - else - print(("Could not connect to %s:%s: %s") - :format(controller_host, controller_port, err or "unknown error")) - return false - end - return true -end - -local function scratchpad(controller_host, controller_port) - return controller(controller_host, controller_port, true) -end - -local function loop(controller_host, controller_port) - return controller(controller_host, controller_port, false) -end - -local function on() - if not (isrunning() and server) then return end - - -- main is set to true under Lua5.2 for the "main" chunk. - -- Lua5.1 returns co as `nil` in that case. - local co, main = coroutine.running() - if main then co = nil end - if co then - coroutines[co] = true - debug.sethook(co, debug_hook, "lcr") - else - if jit then coroutines.main = true end - debug.sethook(debug_hook, "lcr") - end -end - -local function off() - if not (isrunning() and server) then return end - - -- main is set to true under Lua5.2 for the "main" chunk. - -- Lua5.1 returns co as `nil` in that case. - local co, main = coroutine.running() - if main then co = nil end - - -- don't remove coroutine hook under LuaJIT as there is only one (global) hook - if co then - coroutines[co] = false - if not jit then debug.sethook(co) end - else - if jit then coroutines.main = false end - if not jit then debug.sethook() end - end - - -- check if there is any thread that is still being debugged under LuaJIT; - -- if not, turn the debugging off - if jit then - local remove = true - for co, debugged in pairs(coroutines) do - if debugged then remove = false; break end - end - if remove then debug.sethook() end - end -end - --- Handles server debugging commands -local function handle(params, client, options) - local _, _, command = string.find(params, "^([a-z]+)") - local file, line, watch_idx - if command == "run" or command == "step" or command == "out" - or command == "over" or command == "exit" then - client:send(string.upper(command) .. "\n") - client:receive() -- this should consume the first '200 OK' response - while true do - local done = true - local breakpoint = client:receive() - if not breakpoint then - print("Program finished") - os.exit() - return -- use return here for those cases where os.exit() is not wanted - end - local _, _, status = string.find(breakpoint, "^(%d+)") - if status == "200" then - -- don't need to do anything - elseif status == "202" then - _, _, file, line = string.find(breakpoint, "^202 Paused%s+(.-)%s+(%d+)%s*$") - if file and line then - print("Paused at file " .. file .. " line " .. line) - end - elseif status == "203" then - _, _, file, line, watch_idx = string.find(breakpoint, "^203 Paused%s+(.-)%s+(%d+)%s+(%d+)%s*$") - if file and line and watch_idx then - print("Paused at file " .. file .. " line " .. line .. " (watch expression " .. watch_idx .. ": [" .. watches[watch_idx] .. "])") - end - elseif status == "204" then - local _, _, stream, size = string.find(breakpoint, "^204 Output (%w+) (%d+)$") - if stream and size then - local msg = client:receive(tonumber(size)) - print(msg) - if outputs[stream] then outputs[stream](msg) end - -- this was just the output, so go back reading the response - done = false - end - elseif status == "401" then - local _, _, size = string.find(breakpoint, "^401 Error in Execution (%d+)$") - if size then - local msg = client:receive(tonumber(size)) - print("Error in remote application: " .. msg) - os.exit(1) - return nil, nil, msg -- use return here for those cases where os.exit() is not wanted - end - else - print("Unknown error") - os.exit(1) - -- use return here for those cases where os.exit() is not wanted - return nil, nil, "Debugger error: unexpected response '" .. breakpoint .. "'" - end - if done then break end - end - elseif command == "setb" then - _, _, _, file, line = string.find(params, "^([a-z]+)%s+(.-)%s+(%d+)%s*$") - if file and line then - -- if this is a file name, and not a file source - if not file:find('^".*"$') then - file = string.gsub(file, "\\", "/") -- convert slash - file = removebasedir(file, basedir) - end - client:send("SETB " .. file .. " " .. line .. "\n") - if client:receive() == "200 OK" then - set_breakpoint(file, line) - else - print("Error: breakpoint not inserted") - end - else - print("Invalid command") - end - elseif command == "setw" then - local _, _, exp = string.find(params, "^[a-z]+%s+(.+)$") - if exp then - client:send("SETW " .. exp .. "\n") - local answer = client:receive() - local _, _, watch_idx = string.find(answer, "^200 OK (%d+)%s*$") - if watch_idx then - watches[watch_idx] = exp - print("Inserted watch exp no. " .. watch_idx) - else - local _, _, size = string.find(answer, "^401 Error in Expression (%d+)$") - if size then - local err = client:receive(tonumber(size)):gsub(".-:%d+:%s*","") - print("Error: watch expression not set: " .. err) - else - print("Error: watch expression not set") - end - end - else - print("Invalid command") - end - elseif command == "delb" then - _, _, _, file, line = string.find(params, "^([a-z]+)%s+(.-)%s+(%d+)%s*$") - if file and line then - -- if this is a file name, and not a file source - if not file:find('^".*"$') then - file = string.gsub(file, "\\", "/") -- convert slash - file = removebasedir(file, basedir) - end - client:send("DELB " .. file .. " " .. line .. "\n") - if client:receive() == "200 OK" then - remove_breakpoint(file, line) - else - print("Error: breakpoint not removed") - end - else - print("Invalid command") - end - elseif command == "delallb" then - for line, breaks in pairs(breakpoints) do - for file, _ in pairs(breaks) do - client:send("DELB " .. file .. " " .. line .. "\n") - if client:receive() == "200 OK" then - remove_breakpoint(file, line) - else - print("Error: breakpoint at file " .. file .. " line " .. line .. " not removed") - end - end - end - elseif command == "delw" then - local _, _, index = string.find(params, "^[a-z]+%s+(%d+)%s*$") - if index then - client:send("DELW " .. index .. "\n") - if client:receive() == "200 OK" then - watches[index] = nil - else - print("Error: watch expression not removed") - end - else - print("Invalid command") - end - elseif command == "delallw" then - for index, exp in pairs(watches) do - client:send("DELW " .. index .. "\n") - if client:receive() == "200 OK" then - watches[index] = nil - else - print("Error: watch expression at index " .. index .. " [" .. exp .. "] not removed") - end - end - elseif command == "eval" or command == "exec" - or command == "load" or command == "loadstring" - or command == "reload" then - local _, _, exp = string.find(params, "^[a-z]+%s+(.+)$") - if exp or (command == "reload") then - if command == "eval" or command == "exec" then - exp = (exp:gsub("%-%-%[(=*)%[.-%]%1%]", "") -- remove comments - :gsub("%-%-.-\n", " ") -- remove line comments - :gsub("\n", " ")) -- convert new lines - if command == "eval" then exp = "return " .. exp end - client:send("EXEC " .. exp .. "\n") - elseif command == "reload" then - client:send("LOAD 0 -\n") - elseif command == "loadstring" then - local _, _, _, file, lines = string.find(exp, "^([\"'])(.-)%1%s+(.+)") - if not file then - _, _, file, lines = string.find(exp, "^(%S+)%s+(.+)") - end - client:send("LOAD " .. #lines .. " " .. file .. "\n") - client:send(lines) - else - local file = io.open(exp, "r") - if not file and pcall(require, "winapi") then - -- if file is not open and winapi is there, try with a short path; - -- this may be needed for unicode paths on windows - winapi.set_encoding(winapi.CP_UTF8) - file = io.open(winapi.short_path(exp), "r") - end - if not file then error("Cannot open file " .. exp) end - -- read the file and remove the shebang line as it causes a compilation error - local lines = file:read("*all"):gsub("^#!.-\n", "\n") - file:close() - - local file = string.gsub(exp, "\\", "/") -- convert slash - file = removebasedir(file, basedir) - client:send("LOAD " .. #lines .. " " .. file .. "\n") - if #lines > 0 then client:send(lines) end - end - while true do - local params, err = client:receive() - if not params then - return nil, nil, "Debugger connection " .. (err or "error") - end - local done = true - local _, _, status, len = string.find(params, "^(%d+).-%s+(%d+)%s*$") - if status == "200" then - len = tonumber(len) - if len > 0 then - local status, res - local str = client:receive(len) - -- handle serialized table with results - local func, err = loadstring(str) - if func then - status, res = pcall(func) - if not status then err = res - elseif type(res) ~= "table" then - err = "received "..type(res).." instead of expected 'table'" - end - end - if err then - print("Error in processing results: " .. err) - return nil, nil, "Error in processing results: " .. err - end - print(unpack(res)) - return res[1], res - end - elseif status == "201" then - _, _, file, line = string.find(params, "^201 Started%s+(.-)%s+(%d+)%s*$") - elseif status == "202" or params == "200 OK" then - -- do nothing; this only happens when RE/LOAD command gets the response - -- that was for the original command that was aborted - elseif status == "204" then - local _, _, stream, size = string.find(params, "^204 Output (%w+) (%d+)$") - if stream and size then - local msg = client:receive(tonumber(size)) - print(msg) - if outputs[stream] then outputs[stream](msg) end - -- this was just the output, so go back reading the response - done = false - end - elseif status == "401" then - len = tonumber(len) - local res = client:receive(len) - print("Error in expression: " .. res) - return nil, nil, res - else - print("Unknown error") - return nil, nil, "Debugger error: unexpected response after EXEC/LOAD '" .. params .. "'" - end - if done then break end - end - else - print("Invalid command") - end - elseif command == "listb" then - for l, v in pairs(breakpoints) do - for f in pairs(v) do - print(f .. ": " .. l) - end - end - elseif command == "listw" then - for i, v in pairs(watches) do - print("Watch exp. " .. i .. ": " .. v) - end - elseif command == "suspend" then - client:send("SUSPEND\n") - elseif command == "stack" then - client:send("STACK\n") - local resp = client:receive() - local _, _, status, res = string.find(resp, "^(%d+)%s+%w+%s+(.+)%s*$") - if status == "200" then - local func, err = loadstring(res) - if func == nil then - print("Error in stack information: " .. err) - return nil, nil, err - end - local ok, stack = pcall(func) - if not ok then - print("Error in stack information: " .. stack) - return nil, nil, stack - end - for _,frame in ipairs(stack) do - print(serpent.line(frame[1], {comment = false})) - end - return stack - elseif status == "401" then - local _, _, len = string.find(resp, "%s+(%d+)%s*$") - len = tonumber(len) - local res = len > 0 and client:receive(len) or "Invalid stack information." - print("Error in expression: " .. res) - return nil, nil, res - else - print("Unknown error") - return nil, nil, "Debugger error: unexpected response after STACK" - end - elseif command == "output" then - local _, _, stream, mode = string.find(params, "^[a-z]+%s+(%w+)%s+([dcr])%s*$") - if stream and mode then - client:send("OUTPUT "..stream.." "..mode.."\n") - local resp = client:receive() - local _, _, status = string.find(resp, "^(%d+)%s+%w+%s*$") - if status == "200" then - print("Stream "..stream.." redirected") - outputs[stream] = type(options) == 'table' and options.handler or nil - else - print("Unknown error") - return nil, nil, "Debugger error: can't redirect "..stream - end - else - print("Invalid command") - end - elseif command == "basedir" then - local _, _, dir = string.find(params, "^[a-z]+%s+(.+)$") - if dir then - dir = string.gsub(dir, "\\", "/") -- convert slash - if not string.find(dir, "/$") then dir = dir .. "/" end - - local remdir = dir:match("\t(.+)") - if remdir then dir = dir:gsub("/?\t.+", "/") end - basedir = dir - - client:send("BASEDIR "..(remdir or dir).."\n") - local resp = client:receive() - local _, _, status = string.find(resp, "^(%d+)%s+%w+%s*$") - if status == "200" then - print("New base directory is " .. basedir) - else - print("Unknown error") - return nil, nil, "Debugger error: unexpected response after BASEDIR" - end - else - print(basedir) - end - elseif command == "help" then - print("setb -- sets a breakpoint") - print("delb -- removes a breakpoint") - print("delallb -- removes all breakpoints") - print("setw -- adds a new watch expression") - print("delw -- removes the watch expression at index") - print("delallw -- removes all watch expressions") - print("run -- runs until next breakpoint") - print("step -- runs until next line, stepping into function calls") - print("over -- runs until next line, stepping over function calls") - print("out -- runs until line after returning from current function") - print("listb -- lists breakpoints") - print("listw -- lists watch expressions") - print("eval -- evaluates expression on the current context and returns its value") - print("exec -- executes statement on the current context") - print("load -- loads a local file for debugging") - print("reload -- restarts the current debugging session") - print("stack -- reports stack trace") - print("output stdout -- capture and redirect io stream (default|copy|redirect)") - print("basedir [] -- sets the base path of the remote application, or shows the current one") - print("exit -- exits debugger") - else - local _, _, spaces = string.find(params, "^(%s*)$") - if not spaces then - print("Invalid command") - return nil, nil, "Invalid command" - end - end - return file, line -end - --- Starts debugging server -local function listen(host, port) - host = host or "*" - port = port or mobdebug.port - - local socket = require "socket" - - print("Lua Remote Debugger") - print("Run the program you wish to debug") - - local server = socket.bind(host, port) - local client = server:accept() - - client:send("STEP\n") - client:receive() - - local breakpoint = client:receive() - local _, _, file, line = string.find(breakpoint, "^202 Paused%s+(.-)%s+(%d+)%s*$") - if file and line then - print("Paused at file " .. file ) - print("Type 'help' for commands") - else - local _, _, size = string.find(breakpoint, "^401 Error in Execution (%d+)%s*$") - if size then - print("Error in remote application: ") - print(client:receive(size)) - end - end - - while true do - io.write("> ") - local line = io.read("*line") - handle(line, client) - end -end - -local cocreate -local function coro() - if cocreate then return end -- only set once - cocreate = cocreate or coroutine.create - coroutine.create = function(f, ...) - return cocreate(function(...) - require("mobdebug").on() - return f(...) - end, ...) - end -end - -local moconew -local function moai() - if moconew then return end -- only set once - moconew = moconew or (MOAICoroutine and MOAICoroutine.new) - if not moconew then return end - MOAICoroutine.new = function(...) - local thread = moconew(...) - -- need to support both thread.run and getmetatable(thread).run, which - -- was used in earlier MOAI versions - local mt = thread.run and thread or getmetatable(thread) - local patched = mt.run - mt.run = function(self, f, ...) - return patched(self, function(...) - require("mobdebug").on() - return f(...) - end, ...) - end - return thread - end -end - --- this is a function that removes all hooks and closes the socket to --- report back to the controller that the debugging is done. --- the script that called `done` can still continue. -local function done() - if not (isrunning() and server) then return end - - if not jit then - for co, debugged in pairs(coroutines) do - if debugged then debug.sethook(co) end - end - end - - debug.sethook() - server:close() - - coro_debugger = nil -- to make sure isrunning() returns `false` - seen_hook = nil -- to make sure that the next start() call works - abort = nil -- to make sure that callback calls use proper "abort" value -end - --- make public functions available -mobdebug.listen = listen -mobdebug.loop = loop -mobdebug.scratchpad = scratchpad -mobdebug.handle = handle -mobdebug.connect = connect -mobdebug.start = start -mobdebug.on = on -mobdebug.off = off -mobdebug.moai = moai -mobdebug.coro = coro -mobdebug.done = done -mobdebug.line = serpent.line -mobdebug.dump = serpent.dump -mobdebug.yield = nil -- callback - --- this is needed to make "require 'modebug'" to work when mobdebug --- module is loaded manually -package.loaded.mobdebug = mobdebug - -return mobdebug diff --git a/samples/Lua/HelloLua/proj.android/.classpath b/samples/Lua/HelloLua/proj.android/.classpath deleted file mode 100644 index 0b08408342..0000000000 --- a/samples/Lua/HelloLua/proj.android/.classpath +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/samples/Lua/HelloLua/proj.android/.externalToolBuilders/Javah_jni_builder.launch b/samples/Lua/HelloLua/proj.android/.externalToolBuilders/Javah_jni_builder.launch deleted file mode 100644 index 3506e4e944..0000000000 --- a/samples/Lua/HelloLua/proj.android/.externalToolBuilders/Javah_jni_builder.launch +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/samples/Lua/HelloLua/proj.android/.project b/samples/Lua/HelloLua/proj.android/.project deleted file mode 100644 index 2a61577d0c..0000000000 --- a/samples/Lua/HelloLua/proj.android/.project +++ /dev/null @@ -1,50 +0,0 @@ - - - HelloLua - - - - - - com.android.ide.eclipse.adt.ResourceManagerBuilder - - - - - com.android.ide.eclipse.adt.PreCompilerBuilder - - - - - org.eclipse.jdt.core.javabuilder - - - - - com.android.ide.eclipse.adt.ApkBuilder - - - - - org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder - full,incremental, - - - - - - com.android.ide.eclipse.adt.AndroidNature - org.eclipse.jdt.core.javanature - org.eclipse.cdt.core.cnature - org.eclipse.cdt.core.ccnature - org.eclipse.cdt.managedbuilder.core.managedBuildNature - org.eclipse.cdt.managedbuilder.core.ScannerConfigNature - - - - Resources - 2 - PARENT-1-PROJECT_LOC/Resources - - - diff --git a/samples/Lua/HelloLua/proj.android/.settings/org.eclipse.cdt.codan.core.prefs b/samples/Lua/HelloLua/proj.android/.settings/org.eclipse.cdt.codan.core.prefs deleted file mode 100644 index bad4196993..0000000000 --- a/samples/Lua/HelloLua/proj.android/.settings/org.eclipse.cdt.codan.core.prefs +++ /dev/null @@ -1,68 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.cdt.codan.checkers.errnoreturn=-Warning -org.eclipse.cdt.codan.checkers.errnoreturn.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},implicit\=>false} -org.eclipse.cdt.codan.checkers.errreturnvalue=-Error -org.eclipse.cdt.codan.checkers.errreturnvalue.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.checkers.noreturn=-Error -org.eclipse.cdt.codan.checkers.noreturn.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},implicit\=>false} -org.eclipse.cdt.codan.internal.checkers.AbstractClassCreation=-Error -org.eclipse.cdt.codan.internal.checkers.AbstractClassCreation.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.AmbiguousProblem=-Error -org.eclipse.cdt.codan.internal.checkers.AmbiguousProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.AssignmentInConditionProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.AssignmentInConditionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.AssignmentToItselfProblem=-Error -org.eclipse.cdt.codan.internal.checkers.AssignmentToItselfProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.CaseBreakProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.CaseBreakProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},no_break_comment\=>"no break",last_case_param\=>true,empty_case_param\=>false} -org.eclipse.cdt.codan.internal.checkers.CatchByReference=-Warning -org.eclipse.cdt.codan.internal.checkers.CatchByReference.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},unknown\=>false,exceptions\=>()} -org.eclipse.cdt.codan.internal.checkers.CircularReferenceProblem=-Error -org.eclipse.cdt.codan.internal.checkers.CircularReferenceProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.ClassMembersInitialization=-Warning -org.eclipse.cdt.codan.internal.checkers.ClassMembersInitialization.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},skip\=>true} -org.eclipse.cdt.codan.internal.checkers.FieldResolutionProblem=-Error -org.eclipse.cdt.codan.internal.checkers.FieldResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.FunctionResolutionProblem=-Error -org.eclipse.cdt.codan.internal.checkers.FunctionResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.InvalidArguments=-Error -org.eclipse.cdt.codan.internal.checkers.InvalidArguments.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.InvalidTemplateArgumentsProblem=-Error -org.eclipse.cdt.codan.internal.checkers.InvalidTemplateArgumentsProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.LabelStatementNotFoundProblem=-Error -org.eclipse.cdt.codan.internal.checkers.LabelStatementNotFoundProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.MemberDeclarationNotFoundProblem=-Error -org.eclipse.cdt.codan.internal.checkers.MemberDeclarationNotFoundProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.MethodResolutionProblem=-Error -org.eclipse.cdt.codan.internal.checkers.MethodResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.NamingConventionFunctionChecker=-Info -org.eclipse.cdt.codan.internal.checkers.NamingConventionFunctionChecker.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},pattern\=>"^[a-z]",macro\=>true,exceptions\=>()} -org.eclipse.cdt.codan.internal.checkers.NonVirtualDestructorProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.NonVirtualDestructorProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.OverloadProblem=-Error -org.eclipse.cdt.codan.internal.checkers.OverloadProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.RedeclarationProblem=-Error -org.eclipse.cdt.codan.internal.checkers.RedeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.RedefinitionProblem=-Error -org.eclipse.cdt.codan.internal.checkers.RedefinitionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.ReturnStyleProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.ReturnStyleProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.ScanfFormatStringSecurityProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.ScanfFormatStringSecurityProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.StatementHasNoEffectProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.StatementHasNoEffectProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true,exceptions\=>()} -org.eclipse.cdt.codan.internal.checkers.SuggestedParenthesisProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.SuggestedParenthesisProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},paramNot\=>false} -org.eclipse.cdt.codan.internal.checkers.SuspiciousSemicolonProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.SuspiciousSemicolonProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},else\=>false,afterelse\=>false} -org.eclipse.cdt.codan.internal.checkers.TypeResolutionProblem=-Error -org.eclipse.cdt.codan.internal.checkers.TypeResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.UnusedFunctionDeclarationProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.UnusedFunctionDeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true} -org.eclipse.cdt.codan.internal.checkers.UnusedStaticFunctionProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.UnusedStaticFunctionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true} -org.eclipse.cdt.codan.internal.checkers.UnusedVariableDeclarationProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.UnusedVariableDeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true,exceptions\=>("@(\#)","$Id")} -org.eclipse.cdt.codan.internal.checkers.VariableResolutionProblem=-Error -org.eclipse.cdt.codan.internal.checkers.VariableResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -useParentScope=false diff --git a/samples/Lua/HelloLua/proj.android/AndroidManifest.xml b/samples/Lua/HelloLua/proj.android/AndroidManifest.xml deleted file mode 100644 index 0703d5285d..0000000000 --- a/samples/Lua/HelloLua/proj.android/AndroidManifest.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/samples/Lua/HelloLua/proj.android/ant.properties b/samples/Lua/HelloLua/proj.android/ant.properties deleted file mode 100644 index b0971e891e..0000000000 --- a/samples/Lua/HelloLua/proj.android/ant.properties +++ /dev/null @@ -1,17 +0,0 @@ -# This file is used to override default values used by the Ant build system. -# -# This file must be checked into Version Control Systems, as it is -# integral to the build system of your project. - -# This file is only used by the Ant script. - -# You can use this to override default values such as -# 'source.dir' for the location of your java source folder and -# 'out.dir' for the location of your output folder. - -# You can also use it define how the release builds are signed by declaring -# the following properties: -# 'key.store' for the location of your keystore and -# 'key.alias' for the name of the key to use. -# The password will be asked during the build when you use the 'release' target. - diff --git a/samples/Lua/HelloLua/proj.android/build.xml b/samples/Lua/HelloLua/proj.android/build.xml deleted file mode 100644 index ff293087f2..0000000000 --- a/samples/Lua/HelloLua/proj.android/build.xml +++ /dev/null @@ -1,83 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/samples/Lua/HelloLua/proj.android/jni/Android.mk b/samples/Lua/HelloLua/proj.android/jni/Android.mk deleted file mode 100644 index 2c3b9124cf..0000000000 --- a/samples/Lua/HelloLua/proj.android/jni/Android.mk +++ /dev/null @@ -1,20 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE := hellolua_shared - -LOCAL_MODULE_FILENAME := libhellolua - -LOCAL_SRC_FILES := hellolua/main.cpp \ - ../../Classes/AppDelegate.cpp - -LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../Classes \ - $(LOCAL_PATH)/../../../../../external/lua/tolua \ - -LOCAL_WHOLE_STATIC_LIBRARIES := cocos_lua_static - - -include $(BUILD_SHARED_LIBRARY) - -$(call import-module,scripting/lua/bindings) diff --git a/samples/Lua/HelloLua/proj.android/jni/Application.mk b/samples/Lua/HelloLua/proj.android/jni/Application.mk deleted file mode 100644 index 540e49c358..0000000000 --- a/samples/Lua/HelloLua/proj.android/jni/Application.mk +++ /dev/null @@ -1,8 +0,0 @@ -APP_STL := gnustl_static - -# add -Wno-literal-suffix to avoid warning: warning: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wliteral-suffix] -# in NDK_ROOT/arch-arm/usr/include/sys/cdefs_elf.h:35:28: when using ndk-r9 -APP_CPPFLAGS := -frtti -DCOCOS2D_DEBUG=1 -std=c++11 -Wno-literal-suffix -fsigned-char - -APP_CPPFLAGS += -fexceptions - diff --git a/samples/Lua/HelloLua/proj.android/jni/hellolua/main.cpp b/samples/Lua/HelloLua/proj.android/jni/hellolua/main.cpp deleted file mode 100644 index 20e2ea1f45..0000000000 --- a/samples/Lua/HelloLua/proj.android/jni/hellolua/main.cpp +++ /dev/null @@ -1,15 +0,0 @@ -#include "AppDelegate.h" -#include "cocos2d.h" -#include "platform/android/jni/JniHelper.h" -#include -#include - -#define LOG_TAG "main" -#define LOGD(...) __android_log_print(ANDROID_LOG_DEBUG,LOG_TAG,__VA_ARGS__) - -using namespace cocos2d; - -void cocos_android_app_init (struct android_app* app) { - LOGD("cocos_android_app_init"); - AppDelegate *pAppDelegate = new AppDelegate(); -} diff --git a/samples/Lua/HelloLua/proj.android/proguard-project.txt b/samples/Lua/HelloLua/proj.android/proguard-project.txt deleted file mode 100644 index f2fe1559a2..0000000000 --- a/samples/Lua/HelloLua/proj.android/proguard-project.txt +++ /dev/null @@ -1,20 +0,0 @@ -# To enable ProGuard in your project, edit project.properties -# to define the proguard.config property as described in that file. -# -# Add project specific ProGuard rules here. -# By default, the flags in this file are appended to flags specified -# in ${sdk.dir}/tools/proguard/proguard-android.txt -# You can edit the include path and order by changing the ProGuard -# include property in project.properties. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# Add any project specific keep options here: - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} diff --git a/samples/Lua/HelloLua/proj.android/project.properties b/samples/Lua/HelloLua/proj.android/project.properties deleted file mode 100644 index 0a6dc6664d..0000000000 --- a/samples/Lua/HelloLua/proj.android/project.properties +++ /dev/null @@ -1,13 +0,0 @@ -# This file is automatically generated by Android Tools. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file must be checked in Version Control Systems. -# -# To customize properties used by the Ant build system use, -# "ant.properties", and override values to adapt the script to your -# project structure. - -# Project target. -target=android-10 - -android.library.reference.1=../../../../cocos/2d/platform/android/java diff --git a/samples/Lua/HelloLua/proj.android/res/values/strings.xml b/samples/Lua/HelloLua/proj.android/res/values/strings.xml deleted file mode 100644 index d2c2ebdfb1..0000000000 --- a/samples/Lua/HelloLua/proj.android/res/values/strings.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - HelloLua - diff --git a/samples/Lua/HelloLua/proj.android/src/org/cocos2dx/hellolua/Cocos2dxActivity.java b/samples/Lua/HelloLua/proj.android/src/org/cocos2dx/hellolua/Cocos2dxActivity.java deleted file mode 100644 index 9933cf14fd..0000000000 --- a/samples/Lua/HelloLua/proj.android/src/org/cocos2dx/hellolua/Cocos2dxActivity.java +++ /dev/null @@ -1,33 +0,0 @@ -package org.cocos2dx.hellolua; - -import android.app.NativeActivity; -import android.graphics.PixelFormat; -import android.os.Bundle; - -public class Cocos2dxActivity extends NativeActivity { - - @Override - protected void onCreate(Bundle savedInstanceState) { - // TODO Auto-generated method stub - super.onCreate(savedInstanceState); - - //For supports translucency - - //1.change "attribs" in cocos\2d\platform\android\nativeactivity.cpp - /*const EGLint attribs[] = { - EGL_SURFACE_TYPE, EGL_WINDOW_BIT, - EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT, - //EGL_BLUE_SIZE, 5, -->delete - //EGL_GREEN_SIZE, 6, -->delete - //EGL_RED_SIZE, 5, -->delete - EGL_BUFFER_SIZE, 32, //-->new field - EGL_DEPTH_SIZE, 16, - EGL_STENCIL_SIZE, 8, - EGL_NONE - };*/ - - //2.Set the format of window - // getWindow().setFormat(PixelFormat.TRANSLUCENT); - - } -} diff --git a/samples/Lua/HelloLua/proj.ios/AppController.h b/samples/Lua/HelloLua/proj.ios/AppController.h deleted file mode 100644 index 3d51064ca0..0000000000 --- a/samples/Lua/HelloLua/proj.ios/AppController.h +++ /dev/null @@ -1,33 +0,0 @@ -/**************************************************************************** - Copyright (c) 2010 cocos2d-x.org - - http://www.cocos2d-x.org - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - THE SOFTWARE. - ****************************************************************************/ - -@class RootViewController; - -@interface AppController : NSObject { - UIWindow *window; - RootViewController *viewController; -} - -@end - diff --git a/samples/Lua/HelloLua/proj.ios/AppController.mm b/samples/Lua/HelloLua/proj.ios/AppController.mm deleted file mode 100644 index e87a13dbc9..0000000000 --- a/samples/Lua/HelloLua/proj.ios/AppController.mm +++ /dev/null @@ -1,134 +0,0 @@ -/**************************************************************************** - Copyright (c) 2010 cocos2d-x.org - - http://www.cocos2d-x.org - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - THE SOFTWARE. - ****************************************************************************/ -#import -#import "AppController.h" -#import "cocos2d.h" -#import "EAGLView.h" -#import "AppDelegate.h" - -#import "RootViewController.h" - -@implementation AppController - -#pragma mark - -#pragma mark Application lifecycle - -// cocos2d application instance -static AppDelegate s_sharedApplication; - -- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { - - // Override point for customization after application launch. - - // Add the view controller's view to the window and display. - window = [[UIWindow alloc] initWithFrame: [[UIScreen mainScreen] bounds]]; - CCEAGLView *__glView = [CCEAGLView viewWithFrame: [window bounds] - pixelFormat: kEAGLColorFormatRGBA8 - depthFormat: GL_DEPTH_COMPONENT16 - preserveBackbuffer: NO - sharegroup: nil - multiSampling: NO - numberOfSamples: 0 ]; - - // Use RootViewController manage CCEAGLView - viewController = [[RootViewController alloc] initWithNibName:nil bundle:nil]; - viewController.wantsFullScreenLayout = YES; - viewController.view = __glView; - - // Set RootViewController to window - if ( [[UIDevice currentDevice].systemVersion floatValue] < 6.0) - { - // warning: addSubView doesn't work on iOS6 - [window addSubview: viewController.view]; - } - else - { - // use this method on ios6 - [window setRootViewController:viewController]; - } - - [window makeKeyAndVisible]; - - [[UIApplication sharedApplication] setStatusBarHidden: YES]; - - cocos2d::Application::getInstance()->run(); - return YES; -} - - -- (void)applicationWillResignActive:(UIApplication *)application { - /* - Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state. - Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game. - */ - cocos2d::Director::getInstance()->pause(); -} - -- (void)applicationDidBecomeActive:(UIApplication *)application { - /* - Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface. - */ - cocos2d::Director::getInstance()->resume(); -} - -- (void)applicationDidEnterBackground:(UIApplication *)application { - /* - Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later. - If your application supports background execution, called instead of applicationWillTerminate: when the user quits. - */ - cocos2d::Application::getInstance()->applicationDidEnterBackground(); -} - -- (void)applicationWillEnterForeground:(UIApplication *)application { - /* - Called as part of transition from the background to the inactive state: here you can undo many of the changes made on entering the background. - */ - cocos2d::Application::getInstance()->applicationWillEnterForeground(); -} - -- (void)applicationWillTerminate:(UIApplication *)application { - /* - Called when the application is about to terminate. - See also applicationDidEnterBackground:. - */ -} - - -#pragma mark - -#pragma mark Memory management - -- (void)applicationDidReceiveMemoryWarning:(UIApplication *)application { - /* - Free up as much memory as possible by purging cached data objects that can be recreated (or reloaded from disk) later. - */ -} - - -- (void)dealloc { - [super dealloc]; -} - - -@end - diff --git a/samples/Lua/HelloLua/proj.ios/Default-568h@2x.png.REMOVED.git-id b/samples/Lua/HelloLua/proj.ios/Default-568h@2x.png.REMOVED.git-id deleted file mode 100644 index 8f5838f3a8..0000000000 --- a/samples/Lua/HelloLua/proj.ios/Default-568h@2x.png.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -66c6d1cead373b45218424f6a82f370897e443e4 \ No newline at end of file diff --git a/samples/Lua/HelloLua/proj.ios/Default@2x.png.REMOVED.git-id b/samples/Lua/HelloLua/proj.ios/Default@2x.png.REMOVED.git-id deleted file mode 100644 index 8843505b20..0000000000 --- a/samples/Lua/HelloLua/proj.ios/Default@2x.png.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -84689888a14a2123d2b39f7f2f61be8c15207479 \ No newline at end of file diff --git a/samples/Lua/HelloLua/proj.ios/HelloLua_Prefix.pch b/samples/Lua/HelloLua/proj.ios/HelloLua_Prefix.pch deleted file mode 100644 index b4311a0a3d..0000000000 --- a/samples/Lua/HelloLua/proj.ios/HelloLua_Prefix.pch +++ /dev/null @@ -1,8 +0,0 @@ -// -// Prefix header for all source files of the 'HelloLua' target in the 'HelloLua' project -// - -#ifdef __OBJC__ - #import - #import -#endif diff --git a/samples/Lua/HelloLua/proj.ios/RootViewController.h b/samples/Lua/HelloLua/proj.ios/RootViewController.h deleted file mode 100644 index 11dfc4bf88..0000000000 --- a/samples/Lua/HelloLua/proj.ios/RootViewController.h +++ /dev/null @@ -1,33 +0,0 @@ -/**************************************************************************** - Copyright (c) 2010-2011 cocos2d-x.org - Copyright (c) 2010 Ricardo Quesada - - http://www.cocos2d-x.org - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - THE SOFTWARE. - ****************************************************************************/ - -#import - - -@interface RootViewController : UIViewController { - -} -- (BOOL)prefersStatusBarHidden; -@end diff --git a/samples/Lua/HelloLua/proj.ios/RootViewController.mm b/samples/Lua/HelloLua/proj.ios/RootViewController.mm deleted file mode 100644 index a00da00584..0000000000 --- a/samples/Lua/HelloLua/proj.ios/RootViewController.mm +++ /dev/null @@ -1,96 +0,0 @@ -/**************************************************************************** - Copyright (c) 2010-2011 cocos2d-x.org - Copyright (c) 2010 Ricardo Quesada - - http://www.cocos2d-x.org - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - THE SOFTWARE. - ****************************************************************************/ - -#import "RootViewController.h" - - -@implementation RootViewController - -/* - // The designated initializer. Override if you create the controller programmatically and want to perform customization that is not appropriate for viewDidLoad. -- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil { - if ((self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil])) { - // Custom initialization - } - return self; -} -*/ - -/* -// Implement loadView to create a view hierarchy programmatically, without using a nib. -- (void)loadView { -} -*/ - -/* -// Implement viewDidLoad to do additional setup after loading the view, typically from a nib. -- (void)viewDidLoad { - [super viewDidLoad]; -} - -*/ -// Override to allow orientations other than the default portrait orientation. -// This method is deprecated on ios6 -- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { - return UIInterfaceOrientationIsLandscape( interfaceOrientation ); -} - -// For ios6, use supportedInterfaceOrientations & shouldAutorotate instead -- (NSUInteger) supportedInterfaceOrientations{ -#ifdef __IPHONE_6_0 - return UIInterfaceOrientationMaskAllButUpsideDown; -#endif -} - -- (BOOL) shouldAutorotate { - return YES; -} - -//fix not hide status on ios7 -- (BOOL)prefersStatusBarHidden -{ - return YES; -} - -- (void)didReceiveMemoryWarning { - // Releases the view if it doesn't have a superview. - [super didReceiveMemoryWarning]; - - // Release any cached data, images, etc that aren't in use. -} - -- (void)viewDidUnload { - [super viewDidUnload]; - // Release any retained subviews of the main view. - // e.g. self.myOutlet = nil; -} - - -- (void)dealloc { - [super dealloc]; -} - - -@end diff --git a/samples/Lua/HelloLua/proj.ios/main.m b/samples/Lua/HelloLua/proj.ios/main.m deleted file mode 100644 index 27ca9796f7..0000000000 --- a/samples/Lua/HelloLua/proj.ios/main.m +++ /dev/null @@ -1,16 +0,0 @@ -// -// main.m -// HelloLua -// -// Created by Walzer on 11-6-15. -// Copyright __MyCompanyName__ 2011. All rights reserved. -// - -#import - -int main(int argc, char *argv[]) { - NSAutoreleasePool *pool = [NSAutoreleasePool new]; - int retVal = UIApplicationMain(argc, argv, nil, @"AppController"); - [pool release]; - return retVal; -} diff --git a/samples/Lua/HelloLua/proj.linux/main.cpp b/samples/Lua/HelloLua/proj.linux/main.cpp deleted file mode 100644 index fee36d74ed..0000000000 --- a/samples/Lua/HelloLua/proj.linux/main.cpp +++ /dev/null @@ -1,18 +0,0 @@ -#include "../Classes/AppDelegate.h" -#include "cocos2d.h" - -#include -#include -#include -#include - -USING_NS_CC; - -int main(int argc, char **argv) -{ - // create the application instance - AppDelegate app; - EGLView eglView; - eglView.init("HelloLua",900,640); - return Application::getInstance()->run(); -} diff --git a/samples/Lua/HelloLua/proj.mac/HelloLua_Prefix.pch b/samples/Lua/HelloLua/proj.mac/HelloLua_Prefix.pch deleted file mode 100644 index 46c36a7e99..0000000000 --- a/samples/Lua/HelloLua/proj.mac/HelloLua_Prefix.pch +++ /dev/null @@ -1,7 +0,0 @@ -// -// Prefix header for all source files of the 'Paralaxer' target in the 'Paralaxer' project -// - -#ifdef __OBJC__ - #import -#endif diff --git a/samples/Lua/HelloLua/proj.mac/Icon.icns.REMOVED.git-id b/samples/Lua/HelloLua/proj.mac/Icon.icns.REMOVED.git-id deleted file mode 100644 index 9874ec6979..0000000000 --- a/samples/Lua/HelloLua/proj.mac/Icon.icns.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -3d09e8fb4f4ca1c1ae7ab0a6948db592c7c3d9a0 \ No newline at end of file diff --git a/samples/Lua/HelloLua/proj.mac/en.lproj/InfoPlist.strings b/samples/Lua/HelloLua/proj.mac/en.lproj/InfoPlist.strings deleted file mode 100644 index 477b28ff8f..0000000000 --- a/samples/Lua/HelloLua/proj.mac/en.lproj/InfoPlist.strings +++ /dev/null @@ -1,2 +0,0 @@ -/* Localized versions of Info.plist keys */ - diff --git a/samples/Lua/HelloLua/proj.mac/en.lproj/MainMenu.xib b/samples/Lua/HelloLua/proj.mac/en.lproj/MainMenu.xib deleted file mode 100644 index 9f99439250..0000000000 --- a/samples/Lua/HelloLua/proj.mac/en.lproj/MainMenu.xib +++ /dev/null @@ -1,812 +0,0 @@ - - - - 1060 - 10K549 - 1938 - 1038.36 - 461.00 - - com.apple.InterfaceBuilder.CocoaPlugin - 1938 - - - YES - NSMenuItem - NSCustomObject - NSMenu - - - YES - com.apple.InterfaceBuilder.CocoaPlugin - - - PluginDependencyRecalculationVersion - - - - YES - - NSApplication - - - FirstResponder - - - NSApplication - - - AMainMenu - - YES - - - HelloCpp - - 1048576 - 2147483647 - - NSImage - NSMenuCheckmark - - - NSImage - NSMenuMixedState - - submenuAction: - - HelloCpp - - YES - - - About HelloCpp - - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Preferences… - , - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Services - - 1048576 - 2147483647 - - - submenuAction: - - Services - - YES - - _NSServicesMenu - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Hide HelloCpp - h - 1048576 - 2147483647 - - - - - - Hide Others - h - 1572864 - 2147483647 - - - - - - Show All - - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Quit HelloCpp - q - 1048576 - 2147483647 - - - - - _NSAppleMenu - - - - - View - - 1048576 - 2147483647 - - - submenuAction: - - View - - YES - - - Toggle Fullscreen - f - 1048576 - 2147483647 - - - - - - - - - Window - - 1048576 - 2147483647 - - - submenuAction: - - Window - - YES - - - Minimize - m - 1048576 - 2147483647 - - - - - - Zoom - - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Bring All to Front - - 1048576 - 2147483647 - - - - - _NSWindowsMenu - - - - - Help - - 2147483647 - - - submenuAction: - - Help - - YES - - - HelloCpp Help - ? - 1048576 - 2147483647 - - - - - _NSHelpMenu - - - - _NSMainMenu - - - AppController - - - NSFontManager - - - - - YES - - - terminate: - - - - 449 - - - - orderFrontStandardAboutPanel: - - - - 142 - - - - delegate - - - - 495 - - - - performMiniaturize: - - - - 37 - - - - arrangeInFront: - - - - 39 - - - - performZoom: - - - - 240 - - - - hide: - - - - 367 - - - - hideOtherApplications: - - - - 368 - - - - unhideAllApplications: - - - - 370 - - - - showHelp: - - - - 493 - - - - toggleFullScreen: - - - - 537 - - - - - YES - - 0 - - YES - - - - - - -2 - - - File's Owner - - - -1 - - - First Responder - - - -3 - - - Application - - - 29 - - - YES - - - - - - - - - 19 - - - YES - - - - - - 56 - - - YES - - - - - - 57 - - - YES - - - - - - - - - - - - - - - - 58 - - - - - 134 - - - - - 150 - - - - - 136 - - - - - 144 - - - - - 129 - - - - - 143 - - - - - 236 - - - - - 131 - - - YES - - - - - - 149 - - - - - 145 - - - - - 130 - - - - - 24 - - - YES - - - - - - - - - 92 - - - - - 5 - - - - - 239 - - - - - 23 - - - - - 295 - - - YES - - - - - - 296 - - - YES - - - - - - 420 - - - - - 490 - - - YES - - - - - - 491 - - - YES - - - - - - 492 - - - - - 494 - - - - - 536 - - - - - - - YES - - YES - -1.IBPluginDependency - -2.IBPluginDependency - -3.IBPluginDependency - 129.IBPluginDependency - 130.IBPluginDependency - 131.IBPluginDependency - 134.IBPluginDependency - 136.IBPluginDependency - 143.IBPluginDependency - 144.IBPluginDependency - 145.IBPluginDependency - 149.IBPluginDependency - 150.IBPluginDependency - 19.IBPluginDependency - 23.IBPluginDependency - 236.IBPluginDependency - 239.IBPluginDependency - 24.IBPluginDependency - 29.IBPluginDependency - 295.IBPluginDependency - 296.IBPluginDependency - 420.IBPluginDependency - 490.IBPluginDependency - 491.IBPluginDependency - 492.IBPluginDependency - 494.IBPluginDependency - 5.IBPluginDependency - 536.IBPluginDependency - 56.IBPluginDependency - 57.IBPluginDependency - 58.IBPluginDependency - 92.IBPluginDependency - - - YES - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - - - YES - - - - - - YES - - - - - 541 - - - - YES - - AppController - NSObject - - YES - - YES - exitFullScreen: - toggleFullScreen: - - - YES - id - id - - - - YES - - YES - exitFullScreen: - toggleFullScreen: - - - YES - - exitFullScreen: - id - - - toggleFullScreen: - id - - - - - YES - - YES - glView - window - - - YES - EAGLView - Window - - - - YES - - YES - glView - window - - - YES - - glView - EAGLView - - - window - Window - - - - - IBProjectSource - ./Classes/AppController.h - - - - EAGLView - NSOpenGLView - - IBProjectSource - ./Classes/EAGLView.h - - - - - 0 - IBCocoaFramework - - com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 - - - YES - 3 - - YES - - YES - NSMenuCheckmark - NSMenuMixedState - - - YES - {9, 8} - {7, 2} - - - - diff --git a/samples/Lua/HelloLua/proj.mac/main.cpp b/samples/Lua/HelloLua/proj.mac/main.cpp deleted file mode 100644 index 0a43aa7cd7..0000000000 --- a/samples/Lua/HelloLua/proj.mac/main.cpp +++ /dev/null @@ -1,36 +0,0 @@ -/**************************************************************************** - Copyright (c) 2010 cocos2d-x.org - - http://www.cocos2d-x.org - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - THE SOFTWARE. - ****************************************************************************/ - -#include "AppDelegate.h" -#include "cocos2d.h" - -USING_NS_CC; - -int main(int argc, char *argv[]) -{ - AppDelegate app; - EGLView eglView; - eglView.init("HelloLua",900,640); - return Application::getInstance()->run(); -} diff --git a/samples/Lua/HelloLua/proj.win32/HelloLua.vcxproj b/samples/Lua/HelloLua/proj.win32/HelloLua.vcxproj deleted file mode 100644 index 6ed5cb8431..0000000000 --- a/samples/Lua/HelloLua/proj.win32/HelloLua.vcxproj +++ /dev/null @@ -1,206 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {13E55395-94A2-4CD9-BFC2-1A051F80C17D} - HelloLua.win32 - - - - Application - Unicode - v100 - v110 - v110_xp - - - Application - Unicode - v100 - v110 - v110_xp - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration).win32\ - $(Configuration).win32\ - true - $(SolutionDir)$(Configuration).win32\ - $(Configuration).win32\ - false - AllRules.ruleset - - - AllRules.ruleset - - - - - $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath) - - - $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath) - - - - _DEBUG;%(PreprocessorDefinitions) - false - Win32 - true - $(IntDir)HelloLua.tlb - HelloLua.h - - - HelloLua_i.c - HelloLua_p.c - - - Disabled - $(ProjectDir)..\Classes;$(EngineRoot)cocos\scripting\auto-generated\lua-bindings;$(EngineRoot)cocos\scripting\lua\bindings;$(EngineRoot)cocos\audio\include;$(EngineRoot)external\lua\lua;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;%(AdditionalIncludeDirectories) - WIN32;_WINDOWS;STRICT;_DEBUG;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - false - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - 4267;4251;4244;%(DisableSpecificWarnings) - true - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(IntDir);%(AdditionalIncludeDirectories) - - - libcurl_imp.lib;lua51.lib;websockets.lib;%(AdditionalDependencies) - $(OutDir);%(AdditionalLibraryDirectories) - true - Windows - MachineX86 - - - xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua\script" "$(ProjectDir)..\..\HelloLua\Resources" /e /Y - - - if not exist "$(OutDir)" mkdir "$(OutDir)" -xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\websockets\prebuilt\win32\*.*" "$(OutDir)" - - - - - - NDEBUG;%(PreprocessorDefinitions) - false - Win32 - true - $(IntDir)HelloLua.tlb - HelloLua.h - - - HelloLua_i.c - HelloLua_p.c - - - $(ProjectDir)..\Classes;$(EngineRoot)cocos\scripting\auto-generated\lua-bindings;$(EngineRoot)cocos\scripting\lua\bindings;$(EngineRoot)cocos\audio\include;$(EngineRoot)external\lua\lua;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;%(AdditionalIncludeDirectories) - WIN32;_WINDOWS;STRICT;NDEBUG;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - - - MultiThreadedDLL - - - Level3 - - - 4267;4251;4244;%(DisableSpecificWarnings) - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(IntDir);%(AdditionalIncludeDirectories) - - - libcurl_imp.lib;lua51.lib;websockets.lib;%(AdditionalDependencies) - $(OutDir);%(AdditionalLibraryDirectories) - Windows - MachineX86 - true - - - if not exist "$(OutDir)" mkdir "$(OutDir)" -xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\websockets\prebuilt\win32\*.*" "$(OutDir)" - - - - - - - - - - - - - - {98a51ba8-fc3a-415b-ac8f-8c7bd464e93e} - - - {f8edd7fa-9a51-4e80-baeb-860825d2eac6} - - - {811c0dab-7b96-4bd3-a154-b7572b58e4ab} - - - {b57cf53f-2e49-4031-9822-047cc0e6bde2} - - - {b7c2a162-dec9-4418-972e-240ab3cbfcae} - - - {7e06e92c-537a-442b-9e4a-4761c84f8a1a} - - - {df2638c0-8128-4847-867c-6eafe3dee7b5} - - - {ddc3e27f-004d-4dd4-9dd3-931a013d2159} - - - {632a8f38-d0f0-4d22-86b3-d69f5e6bf63a} - - - {21b2c324-891f-48ea-ad1a-5ae13de12e28} - - - {207bc7a9-ccf1-4f2f-a04d-45f72242ae25} - - - - - - \ No newline at end of file diff --git a/samples/Lua/HelloLua/proj.win32/HelloLua.vcxproj.filters b/samples/Lua/HelloLua/proj.win32/HelloLua.vcxproj.filters deleted file mode 100644 index 5de7838f8f..0000000000 --- a/samples/Lua/HelloLua/proj.win32/HelloLua.vcxproj.filters +++ /dev/null @@ -1,27 +0,0 @@ - - - - - {83371666-be62-4e91-b8cc-395730853621} - - - {917fb40f-fc6d-4ee9-9a20-26debabe41aa} - - - - - Classes - - - win32 - - - - - Classes - - - win32 - - - \ No newline at end of file diff --git a/samples/Lua/HelloLua/proj.win32/HelloLua.vcxproj.user b/samples/Lua/HelloLua/proj.win32/HelloLua.vcxproj.user deleted file mode 100644 index 32a6296820..0000000000 --- a/samples/Lua/HelloLua/proj.win32/HelloLua.vcxproj.user +++ /dev/null @@ -1,11 +0,0 @@ - - - - $(ProjectDir)..\Resources - WindowsLocalDebugger - - - $(ProjectDir)..\Resources - WindowsLocalDebugger - - \ No newline at end of file diff --git a/samples/Lua/HelloLua/proj.win32/main.cpp b/samples/Lua/HelloLua/proj.win32/main.cpp deleted file mode 100644 index b07e50bc66..0000000000 --- a/samples/Lua/HelloLua/proj.win32/main.cpp +++ /dev/null @@ -1,37 +0,0 @@ -#include "main.h" -#include "AppDelegate.h" -#include "CCEGLView.h" - -USING_NS_CC; - -// uncomment below line, open debug console -#define USE_WIN32_CONSOLE - -int APIENTRY _tWinMain(HINSTANCE hInstance, - HINSTANCE hPrevInstance, - LPTSTR lpCmdLine, - int nCmdShow) -{ - UNREFERENCED_PARAMETER(hPrevInstance); - UNREFERENCED_PARAMETER(lpCmdLine); - -#ifdef USE_WIN32_CONSOLE - AllocConsole(); - freopen("CONIN$", "r", stdin); - freopen("CONOUT$", "w", stdout); - freopen("CONOUT$", "w", stderr); -#endif - - // create the application instance - AppDelegate app; - EGLView eglView; - eglView.init("HelloLua",900,640); - - int ret = Application::getInstance()->run(); - -#ifdef USE_WIN32_CONSOLE - FreeConsole(); -#endif - - return ret; -} diff --git a/samples/Lua/HelloLua/proj.win32/main.h b/samples/Lua/HelloLua/proj.win32/main.h deleted file mode 100644 index e74708bdf2..0000000000 --- a/samples/Lua/HelloLua/proj.win32/main.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef __MAIN_H__ -#define __MAIN_H__ - -#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers - -// Windows Header Files: -#include -#include - -// C RunTime Header Files -#include "CCStdC.h" - -#endif // __MAIN_H__ diff --git a/samples/Lua/TestLua/proj.android/.classpath b/samples/Lua/TestLua/proj.android/.classpath deleted file mode 100644 index 0b08408342..0000000000 --- a/samples/Lua/TestLua/proj.android/.classpath +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/samples/Lua/TestLua/proj.android/ant.properties b/samples/Lua/TestLua/proj.android/ant.properties deleted file mode 100644 index b0971e891e..0000000000 --- a/samples/Lua/TestLua/proj.android/ant.properties +++ /dev/null @@ -1,17 +0,0 @@ -# This file is used to override default values used by the Ant build system. -# -# This file must be checked into Version Control Systems, as it is -# integral to the build system of your project. - -# This file is only used by the Ant script. - -# You can use this to override default values such as -# 'source.dir' for the location of your java source folder and -# 'out.dir' for the location of your output folder. - -# You can also use it define how the release builds are signed by declaring -# the following properties: -# 'key.store' for the location of your keystore and -# 'key.alias' for the name of the key to use. -# The password will be asked during the build when you use the 'release' target. - diff --git a/samples/Lua/TestLua/proj.android/proguard-project.txt b/samples/Lua/TestLua/proj.android/proguard-project.txt deleted file mode 100644 index f2fe1559a2..0000000000 --- a/samples/Lua/TestLua/proj.android/proguard-project.txt +++ /dev/null @@ -1,20 +0,0 @@ -# To enable ProGuard in your project, edit project.properties -# to define the proguard.config property as described in that file. -# -# Add project specific ProGuard rules here. -# By default, the flags in this file are appended to flags specified -# in ${sdk.dir}/tools/proguard/proguard-android.txt -# You can edit the include path and order by changing the ProGuard -# include property in project.properties. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# Add any project specific keep options here: - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} diff --git a/samples/Lua/TestLua/proj.android/project.properties b/samples/Lua/TestLua/proj.android/project.properties deleted file mode 100644 index 0a6dc6664d..0000000000 --- a/samples/Lua/TestLua/proj.android/project.properties +++ /dev/null @@ -1,13 +0,0 @@ -# This file is automatically generated by Android Tools. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file must be checked in Version Control Systems. -# -# To customize properties used by the Ant build system use, -# "ant.properties", and override values to adapt the script to your -# project structure. - -# Project target. -target=android-10 - -android.library.reference.1=../../../../cocos/2d/platform/android/java diff --git a/samples/Lua/TestLua/proj.ios/AppController.h b/samples/Lua/TestLua/proj.ios/AppController.h deleted file mode 100644 index 3d51064ca0..0000000000 --- a/samples/Lua/TestLua/proj.ios/AppController.h +++ /dev/null @@ -1,33 +0,0 @@ -/**************************************************************************** - Copyright (c) 2010 cocos2d-x.org - - http://www.cocos2d-x.org - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - THE SOFTWARE. - ****************************************************************************/ - -@class RootViewController; - -@interface AppController : NSObject { - UIWindow *window; - RootViewController *viewController; -} - -@end - diff --git a/samples/Lua/TestLua/proj.ios/Default-568h@2x.png.REMOVED.git-id b/samples/Lua/TestLua/proj.ios/Default-568h@2x.png.REMOVED.git-id deleted file mode 100644 index 8f5838f3a8..0000000000 --- a/samples/Lua/TestLua/proj.ios/Default-568h@2x.png.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -66c6d1cead373b45218424f6a82f370897e443e4 \ No newline at end of file diff --git a/samples/Lua/TestLua/proj.ios/Default@2x.png.REMOVED.git-id b/samples/Lua/TestLua/proj.ios/Default@2x.png.REMOVED.git-id deleted file mode 100644 index 8843505b20..0000000000 --- a/samples/Lua/TestLua/proj.ios/Default@2x.png.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -84689888a14a2123d2b39f7f2f61be8c15207479 \ No newline at end of file diff --git a/samples/Lua/TestLua/proj.ios/RootViewController.h b/samples/Lua/TestLua/proj.ios/RootViewController.h deleted file mode 100644 index 11dfc4bf88..0000000000 --- a/samples/Lua/TestLua/proj.ios/RootViewController.h +++ /dev/null @@ -1,33 +0,0 @@ -/**************************************************************************** - Copyright (c) 2010-2011 cocos2d-x.org - Copyright (c) 2010 Ricardo Quesada - - http://www.cocos2d-x.org - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - THE SOFTWARE. - ****************************************************************************/ - -#import - - -@interface RootViewController : UIViewController { - -} -- (BOOL)prefersStatusBarHidden; -@end diff --git a/samples/Lua/TestLua/proj.ios/RootViewController.mm b/samples/Lua/TestLua/proj.ios/RootViewController.mm deleted file mode 100644 index a00da00584..0000000000 --- a/samples/Lua/TestLua/proj.ios/RootViewController.mm +++ /dev/null @@ -1,96 +0,0 @@ -/**************************************************************************** - Copyright (c) 2010-2011 cocos2d-x.org - Copyright (c) 2010 Ricardo Quesada - - http://www.cocos2d-x.org - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - THE SOFTWARE. - ****************************************************************************/ - -#import "RootViewController.h" - - -@implementation RootViewController - -/* - // The designated initializer. Override if you create the controller programmatically and want to perform customization that is not appropriate for viewDidLoad. -- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil { - if ((self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil])) { - // Custom initialization - } - return self; -} -*/ - -/* -// Implement loadView to create a view hierarchy programmatically, without using a nib. -- (void)loadView { -} -*/ - -/* -// Implement viewDidLoad to do additional setup after loading the view, typically from a nib. -- (void)viewDidLoad { - [super viewDidLoad]; -} - -*/ -// Override to allow orientations other than the default portrait orientation. -// This method is deprecated on ios6 -- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { - return UIInterfaceOrientationIsLandscape( interfaceOrientation ); -} - -// For ios6, use supportedInterfaceOrientations & shouldAutorotate instead -- (NSUInteger) supportedInterfaceOrientations{ -#ifdef __IPHONE_6_0 - return UIInterfaceOrientationMaskAllButUpsideDown; -#endif -} - -- (BOOL) shouldAutorotate { - return YES; -} - -//fix not hide status on ios7 -- (BOOL)prefersStatusBarHidden -{ - return YES; -} - -- (void)didReceiveMemoryWarning { - // Releases the view if it doesn't have a superview. - [super didReceiveMemoryWarning]; - - // Release any cached data, images, etc that aren't in use. -} - -- (void)viewDidUnload { - [super viewDidUnload]; - // Release any retained subviews of the main view. - // e.g. self.myOutlet = nil; -} - - -- (void)dealloc { - [super dealloc]; -} - - -@end diff --git a/samples/Lua/TestLua/proj.mac/Icon.icns.REMOVED.git-id b/samples/Lua/TestLua/proj.mac/Icon.icns.REMOVED.git-id deleted file mode 100644 index 9874ec6979..0000000000 --- a/samples/Lua/TestLua/proj.mac/Icon.icns.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -3d09e8fb4f4ca1c1ae7ab0a6948db592c7c3d9a0 \ No newline at end of file diff --git a/samples/Lua/TestLua/proj.mac/en.lproj/InfoPlist.strings b/samples/Lua/TestLua/proj.mac/en.lproj/InfoPlist.strings deleted file mode 100644 index 477b28ff8f..0000000000 --- a/samples/Lua/TestLua/proj.mac/en.lproj/InfoPlist.strings +++ /dev/null @@ -1,2 +0,0 @@ -/* Localized versions of Info.plist keys */ - diff --git a/samples/Lua/TestLua/proj.mac/en.lproj/MainMenu.xib b/samples/Lua/TestLua/proj.mac/en.lproj/MainMenu.xib deleted file mode 100644 index 9f99439250..0000000000 --- a/samples/Lua/TestLua/proj.mac/en.lproj/MainMenu.xib +++ /dev/null @@ -1,812 +0,0 @@ - - - - 1060 - 10K549 - 1938 - 1038.36 - 461.00 - - com.apple.InterfaceBuilder.CocoaPlugin - 1938 - - - YES - NSMenuItem - NSCustomObject - NSMenu - - - YES - com.apple.InterfaceBuilder.CocoaPlugin - - - PluginDependencyRecalculationVersion - - - - YES - - NSApplication - - - FirstResponder - - - NSApplication - - - AMainMenu - - YES - - - HelloCpp - - 1048576 - 2147483647 - - NSImage - NSMenuCheckmark - - - NSImage - NSMenuMixedState - - submenuAction: - - HelloCpp - - YES - - - About HelloCpp - - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Preferences… - , - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Services - - 1048576 - 2147483647 - - - submenuAction: - - Services - - YES - - _NSServicesMenu - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Hide HelloCpp - h - 1048576 - 2147483647 - - - - - - Hide Others - h - 1572864 - 2147483647 - - - - - - Show All - - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Quit HelloCpp - q - 1048576 - 2147483647 - - - - - _NSAppleMenu - - - - - View - - 1048576 - 2147483647 - - - submenuAction: - - View - - YES - - - Toggle Fullscreen - f - 1048576 - 2147483647 - - - - - - - - - Window - - 1048576 - 2147483647 - - - submenuAction: - - Window - - YES - - - Minimize - m - 1048576 - 2147483647 - - - - - - Zoom - - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Bring All to Front - - 1048576 - 2147483647 - - - - - _NSWindowsMenu - - - - - Help - - 2147483647 - - - submenuAction: - - Help - - YES - - - HelloCpp Help - ? - 1048576 - 2147483647 - - - - - _NSHelpMenu - - - - _NSMainMenu - - - AppController - - - NSFontManager - - - - - YES - - - terminate: - - - - 449 - - - - orderFrontStandardAboutPanel: - - - - 142 - - - - delegate - - - - 495 - - - - performMiniaturize: - - - - 37 - - - - arrangeInFront: - - - - 39 - - - - performZoom: - - - - 240 - - - - hide: - - - - 367 - - - - hideOtherApplications: - - - - 368 - - - - unhideAllApplications: - - - - 370 - - - - showHelp: - - - - 493 - - - - toggleFullScreen: - - - - 537 - - - - - YES - - 0 - - YES - - - - - - -2 - - - File's Owner - - - -1 - - - First Responder - - - -3 - - - Application - - - 29 - - - YES - - - - - - - - - 19 - - - YES - - - - - - 56 - - - YES - - - - - - 57 - - - YES - - - - - - - - - - - - - - - - 58 - - - - - 134 - - - - - 150 - - - - - 136 - - - - - 144 - - - - - 129 - - - - - 143 - - - - - 236 - - - - - 131 - - - YES - - - - - - 149 - - - - - 145 - - - - - 130 - - - - - 24 - - - YES - - - - - - - - - 92 - - - - - 5 - - - - - 239 - - - - - 23 - - - - - 295 - - - YES - - - - - - 296 - - - YES - - - - - - 420 - - - - - 490 - - - YES - - - - - - 491 - - - YES - - - - - - 492 - - - - - 494 - - - - - 536 - - - - - - - YES - - YES - -1.IBPluginDependency - -2.IBPluginDependency - -3.IBPluginDependency - 129.IBPluginDependency - 130.IBPluginDependency - 131.IBPluginDependency - 134.IBPluginDependency - 136.IBPluginDependency - 143.IBPluginDependency - 144.IBPluginDependency - 145.IBPluginDependency - 149.IBPluginDependency - 150.IBPluginDependency - 19.IBPluginDependency - 23.IBPluginDependency - 236.IBPluginDependency - 239.IBPluginDependency - 24.IBPluginDependency - 29.IBPluginDependency - 295.IBPluginDependency - 296.IBPluginDependency - 420.IBPluginDependency - 490.IBPluginDependency - 491.IBPluginDependency - 492.IBPluginDependency - 494.IBPluginDependency - 5.IBPluginDependency - 536.IBPluginDependency - 56.IBPluginDependency - 57.IBPluginDependency - 58.IBPluginDependency - 92.IBPluginDependency - - - YES - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - - - YES - - - - - - YES - - - - - 541 - - - - YES - - AppController - NSObject - - YES - - YES - exitFullScreen: - toggleFullScreen: - - - YES - id - id - - - - YES - - YES - exitFullScreen: - toggleFullScreen: - - - YES - - exitFullScreen: - id - - - toggleFullScreen: - id - - - - - YES - - YES - glView - window - - - YES - EAGLView - Window - - - - YES - - YES - glView - window - - - YES - - glView - EAGLView - - - window - Window - - - - - IBProjectSource - ./Classes/AppController.h - - - - EAGLView - NSOpenGLView - - IBProjectSource - ./Classes/EAGLView.h - - - - - 0 - IBCocoaFramework - - com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 - - - YES - 3 - - YES - - YES - NSMenuCheckmark - NSMenuMixedState - - - YES - {9, 8} - {7, 2} - - - - diff --git a/samples/Cpp/TestCpp/.cproject b/samples/TestCpp/.cproject similarity index 100% rename from samples/Cpp/TestCpp/.cproject rename to samples/TestCpp/.cproject diff --git a/samples/Cpp/TestCpp/.externalToolBuilders/Javah_jni_builder.launch b/samples/TestCpp/.externalToolBuilders/Javah_jni_builder.launch similarity index 100% rename from samples/Cpp/TestCpp/.externalToolBuilders/Javah_jni_builder.launch rename to samples/TestCpp/.externalToolBuilders/Javah_jni_builder.launch diff --git a/samples/Cpp/TestCpp/Android.mk b/samples/TestCpp/Android.mk similarity index 100% rename from samples/Cpp/TestCpp/Android.mk rename to samples/TestCpp/Android.mk diff --git a/samples/Cpp/TestCpp/CMakeLists.txt b/samples/TestCpp/CMakeLists.txt similarity index 100% rename from samples/Cpp/TestCpp/CMakeLists.txt rename to samples/TestCpp/CMakeLists.txt diff --git a/samples/Cpp/TestCpp/Classes/AccelerometerTest/AccelerometerTest.cpp b/samples/TestCpp/Classes/AccelerometerTest/AccelerometerTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/AccelerometerTest/AccelerometerTest.cpp rename to samples/TestCpp/Classes/AccelerometerTest/AccelerometerTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/AccelerometerTest/AccelerometerTest.h b/samples/TestCpp/Classes/AccelerometerTest/AccelerometerTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/AccelerometerTest/AccelerometerTest.h rename to samples/TestCpp/Classes/AccelerometerTest/AccelerometerTest.h diff --git a/samples/Cpp/TestCpp/Classes/ActionManagerTest/ActionManagerTest.cpp b/samples/TestCpp/Classes/ActionManagerTest/ActionManagerTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/ActionManagerTest/ActionManagerTest.cpp rename to samples/TestCpp/Classes/ActionManagerTest/ActionManagerTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/ActionManagerTest/ActionManagerTest.h b/samples/TestCpp/Classes/ActionManagerTest/ActionManagerTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/ActionManagerTest/ActionManagerTest.h rename to samples/TestCpp/Classes/ActionManagerTest/ActionManagerTest.h diff --git a/samples/Cpp/TestCpp/Classes/ActionsEaseTest/ActionsEaseTest.cpp b/samples/TestCpp/Classes/ActionsEaseTest/ActionsEaseTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/ActionsEaseTest/ActionsEaseTest.cpp rename to samples/TestCpp/Classes/ActionsEaseTest/ActionsEaseTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/ActionsEaseTest/ActionsEaseTest.h b/samples/TestCpp/Classes/ActionsEaseTest/ActionsEaseTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/ActionsEaseTest/ActionsEaseTest.h rename to samples/TestCpp/Classes/ActionsEaseTest/ActionsEaseTest.h diff --git a/samples/Cpp/TestCpp/Classes/ActionsProgressTest/ActionsProgressTest.cpp b/samples/TestCpp/Classes/ActionsProgressTest/ActionsProgressTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/ActionsProgressTest/ActionsProgressTest.cpp rename to samples/TestCpp/Classes/ActionsProgressTest/ActionsProgressTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/ActionsProgressTest/ActionsProgressTest.h b/samples/TestCpp/Classes/ActionsProgressTest/ActionsProgressTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/ActionsProgressTest/ActionsProgressTest.h rename to samples/TestCpp/Classes/ActionsProgressTest/ActionsProgressTest.h diff --git a/samples/Cpp/TestCpp/Classes/ActionsTest/ActionsTest.cpp b/samples/TestCpp/Classes/ActionsTest/ActionsTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/ActionsTest/ActionsTest.cpp rename to samples/TestCpp/Classes/ActionsTest/ActionsTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/ActionsTest/ActionsTest.h b/samples/TestCpp/Classes/ActionsTest/ActionsTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/ActionsTest/ActionsTest.h rename to samples/TestCpp/Classes/ActionsTest/ActionsTest.h diff --git a/samples/Cpp/TestCpp/Classes/AppDelegate.cpp b/samples/TestCpp/Classes/AppDelegate.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/AppDelegate.cpp rename to samples/TestCpp/Classes/AppDelegate.cpp diff --git a/samples/Cpp/HelloCpp/Classes/AppDelegate.h b/samples/TestCpp/Classes/AppDelegate.h similarity index 100% rename from samples/Cpp/HelloCpp/Classes/AppDelegate.h rename to samples/TestCpp/Classes/AppDelegate.h diff --git a/samples/Cpp/TestCpp/Classes/BaseTest.cpp b/samples/TestCpp/Classes/BaseTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/BaseTest.cpp rename to samples/TestCpp/Classes/BaseTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/BaseTest.h b/samples/TestCpp/Classes/BaseTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/BaseTest.h rename to samples/TestCpp/Classes/BaseTest.h diff --git a/samples/Cpp/TestCpp/Classes/Box2DTest/Box2dTest.cpp b/samples/TestCpp/Classes/Box2DTest/Box2dTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/Box2DTest/Box2dTest.cpp rename to samples/TestCpp/Classes/Box2DTest/Box2dTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/Box2DTest/Box2dTest.h b/samples/TestCpp/Classes/Box2DTest/Box2dTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/Box2DTest/Box2dTest.h rename to samples/TestCpp/Classes/Box2DTest/Box2dTest.h diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Box2dView.cpp b/samples/TestCpp/Classes/Box2DTestBed/Box2dView.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Box2dView.cpp rename to samples/TestCpp/Classes/Box2DTestBed/Box2dView.cpp diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Box2dView.h b/samples/TestCpp/Classes/Box2DTestBed/Box2dView.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Box2dView.h rename to samples/TestCpp/Classes/Box2DTestBed/Box2dView.h diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/GLES-Render.cpp b/samples/TestCpp/Classes/Box2DTestBed/GLES-Render.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/GLES-Render.cpp rename to samples/TestCpp/Classes/Box2DTestBed/GLES-Render.cpp diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/GLES-Render.h b/samples/TestCpp/Classes/Box2DTestBed/GLES-Render.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/GLES-Render.h rename to samples/TestCpp/Classes/Box2DTestBed/GLES-Render.h diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Test.cpp b/samples/TestCpp/Classes/Box2DTestBed/Test.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Test.cpp rename to samples/TestCpp/Classes/Box2DTestBed/Test.cpp diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Test.h b/samples/TestCpp/Classes/Box2DTestBed/Test.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Test.h rename to samples/TestCpp/Classes/Box2DTestBed/Test.h diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/TestEntries.cpp b/samples/TestCpp/Classes/Box2DTestBed/TestEntries.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/TestEntries.cpp rename to samples/TestCpp/Classes/Box2DTestBed/TestEntries.cpp diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/AddPair.h b/samples/TestCpp/Classes/Box2DTestBed/Tests/AddPair.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/AddPair.h rename to samples/TestCpp/Classes/Box2DTestBed/Tests/AddPair.h diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/ApplyForce.h b/samples/TestCpp/Classes/Box2DTestBed/Tests/ApplyForce.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/ApplyForce.h rename to samples/TestCpp/Classes/Box2DTestBed/Tests/ApplyForce.h diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/BodyTypes.h b/samples/TestCpp/Classes/Box2DTestBed/Tests/BodyTypes.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/BodyTypes.h rename to samples/TestCpp/Classes/Box2DTestBed/Tests/BodyTypes.h diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/Breakable.h b/samples/TestCpp/Classes/Box2DTestBed/Tests/Breakable.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/Breakable.h rename to samples/TestCpp/Classes/Box2DTestBed/Tests/Breakable.h diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/Bridge.h b/samples/TestCpp/Classes/Box2DTestBed/Tests/Bridge.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/Bridge.h rename to samples/TestCpp/Classes/Box2DTestBed/Tests/Bridge.h diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/BulletTest.h b/samples/TestCpp/Classes/Box2DTestBed/Tests/BulletTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/BulletTest.h rename to samples/TestCpp/Classes/Box2DTestBed/Tests/BulletTest.h diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/Cantilever.h b/samples/TestCpp/Classes/Box2DTestBed/Tests/Cantilever.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/Cantilever.h rename to samples/TestCpp/Classes/Box2DTestBed/Tests/Cantilever.h diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/Car.h b/samples/TestCpp/Classes/Box2DTestBed/Tests/Car.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/Car.h rename to samples/TestCpp/Classes/Box2DTestBed/Tests/Car.h diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/Chain.h b/samples/TestCpp/Classes/Box2DTestBed/Tests/Chain.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/Chain.h rename to samples/TestCpp/Classes/Box2DTestBed/Tests/Chain.h diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/CharacterCollision.h b/samples/TestCpp/Classes/Box2DTestBed/Tests/CharacterCollision.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/CharacterCollision.h rename to samples/TestCpp/Classes/Box2DTestBed/Tests/CharacterCollision.h diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/CollisionFiltering.h b/samples/TestCpp/Classes/Box2DTestBed/Tests/CollisionFiltering.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/CollisionFiltering.h rename to samples/TestCpp/Classes/Box2DTestBed/Tests/CollisionFiltering.h diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/CollisionProcessing.h b/samples/TestCpp/Classes/Box2DTestBed/Tests/CollisionProcessing.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/CollisionProcessing.h rename to samples/TestCpp/Classes/Box2DTestBed/Tests/CollisionProcessing.h diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/CompoundShapes.h b/samples/TestCpp/Classes/Box2DTestBed/Tests/CompoundShapes.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/CompoundShapes.h rename to samples/TestCpp/Classes/Box2DTestBed/Tests/CompoundShapes.h diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/Confined.h b/samples/TestCpp/Classes/Box2DTestBed/Tests/Confined.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/Confined.h rename to samples/TestCpp/Classes/Box2DTestBed/Tests/Confined.h diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/ContinuousTest.h b/samples/TestCpp/Classes/Box2DTestBed/Tests/ContinuousTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/ContinuousTest.h rename to samples/TestCpp/Classes/Box2DTestBed/Tests/ContinuousTest.h diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/ConvexHull.h b/samples/TestCpp/Classes/Box2DTestBed/Tests/ConvexHull.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/ConvexHull.h rename to samples/TestCpp/Classes/Box2DTestBed/Tests/ConvexHull.h diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/ConveyorBelt.h b/samples/TestCpp/Classes/Box2DTestBed/Tests/ConveyorBelt.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/ConveyorBelt.h rename to samples/TestCpp/Classes/Box2DTestBed/Tests/ConveyorBelt.h diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/DistanceTest.h b/samples/TestCpp/Classes/Box2DTestBed/Tests/DistanceTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/DistanceTest.h rename to samples/TestCpp/Classes/Box2DTestBed/Tests/DistanceTest.h diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/Dominos.h b/samples/TestCpp/Classes/Box2DTestBed/Tests/Dominos.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/Dominos.h rename to samples/TestCpp/Classes/Box2DTestBed/Tests/Dominos.h diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/DumpShell.h b/samples/TestCpp/Classes/Box2DTestBed/Tests/DumpShell.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/DumpShell.h rename to samples/TestCpp/Classes/Box2DTestBed/Tests/DumpShell.h diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/DynamicTreeTest.h b/samples/TestCpp/Classes/Box2DTestBed/Tests/DynamicTreeTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/DynamicTreeTest.h rename to samples/TestCpp/Classes/Box2DTestBed/Tests/DynamicTreeTest.h diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/EdgeShapes.h b/samples/TestCpp/Classes/Box2DTestBed/Tests/EdgeShapes.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/EdgeShapes.h rename to samples/TestCpp/Classes/Box2DTestBed/Tests/EdgeShapes.h diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/EdgeTest.h b/samples/TestCpp/Classes/Box2DTestBed/Tests/EdgeTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/EdgeTest.h rename to samples/TestCpp/Classes/Box2DTestBed/Tests/EdgeTest.h diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/Gears.h b/samples/TestCpp/Classes/Box2DTestBed/Tests/Gears.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/Gears.h rename to samples/TestCpp/Classes/Box2DTestBed/Tests/Gears.h diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/Mobile.h b/samples/TestCpp/Classes/Box2DTestBed/Tests/Mobile.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/Mobile.h rename to samples/TestCpp/Classes/Box2DTestBed/Tests/Mobile.h diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/MobileBalanced.h b/samples/TestCpp/Classes/Box2DTestBed/Tests/MobileBalanced.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/MobileBalanced.h rename to samples/TestCpp/Classes/Box2DTestBed/Tests/MobileBalanced.h diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/MotorJoint.h b/samples/TestCpp/Classes/Box2DTestBed/Tests/MotorJoint.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/MotorJoint.h rename to samples/TestCpp/Classes/Box2DTestBed/Tests/MotorJoint.h diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/OneSidedPlatform.h b/samples/TestCpp/Classes/Box2DTestBed/Tests/OneSidedPlatform.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/OneSidedPlatform.h rename to samples/TestCpp/Classes/Box2DTestBed/Tests/OneSidedPlatform.h diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/Pinball.h b/samples/TestCpp/Classes/Box2DTestBed/Tests/Pinball.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/Pinball.h rename to samples/TestCpp/Classes/Box2DTestBed/Tests/Pinball.h diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/PolyCollision.h b/samples/TestCpp/Classes/Box2DTestBed/Tests/PolyCollision.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/PolyCollision.h rename to samples/TestCpp/Classes/Box2DTestBed/Tests/PolyCollision.h diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/PolyShapes.h b/samples/TestCpp/Classes/Box2DTestBed/Tests/PolyShapes.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/PolyShapes.h rename to samples/TestCpp/Classes/Box2DTestBed/Tests/PolyShapes.h diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/Prismatic.h b/samples/TestCpp/Classes/Box2DTestBed/Tests/Prismatic.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/Prismatic.h rename to samples/TestCpp/Classes/Box2DTestBed/Tests/Prismatic.h diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/Pulleys.h b/samples/TestCpp/Classes/Box2DTestBed/Tests/Pulleys.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/Pulleys.h rename to samples/TestCpp/Classes/Box2DTestBed/Tests/Pulleys.h diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/Pyramid.h b/samples/TestCpp/Classes/Box2DTestBed/Tests/Pyramid.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/Pyramid.h rename to samples/TestCpp/Classes/Box2DTestBed/Tests/Pyramid.h diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/RayCast.h b/samples/TestCpp/Classes/Box2DTestBed/Tests/RayCast.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/RayCast.h rename to samples/TestCpp/Classes/Box2DTestBed/Tests/RayCast.h diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/Revolute.h b/samples/TestCpp/Classes/Box2DTestBed/Tests/Revolute.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/Revolute.h rename to samples/TestCpp/Classes/Box2DTestBed/Tests/Revolute.h diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/Rope.h b/samples/TestCpp/Classes/Box2DTestBed/Tests/Rope.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/Rope.h rename to samples/TestCpp/Classes/Box2DTestBed/Tests/Rope.h diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/RopeJoint.h b/samples/TestCpp/Classes/Box2DTestBed/Tests/RopeJoint.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/RopeJoint.h rename to samples/TestCpp/Classes/Box2DTestBed/Tests/RopeJoint.h diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/SensorTest.h b/samples/TestCpp/Classes/Box2DTestBed/Tests/SensorTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/SensorTest.h rename to samples/TestCpp/Classes/Box2DTestBed/Tests/SensorTest.h diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/ShapeEditing.h b/samples/TestCpp/Classes/Box2DTestBed/Tests/ShapeEditing.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/ShapeEditing.h rename to samples/TestCpp/Classes/Box2DTestBed/Tests/ShapeEditing.h diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/SliderCrank.h b/samples/TestCpp/Classes/Box2DTestBed/Tests/SliderCrank.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/SliderCrank.h rename to samples/TestCpp/Classes/Box2DTestBed/Tests/SliderCrank.h diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/SphereStack.h b/samples/TestCpp/Classes/Box2DTestBed/Tests/SphereStack.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/SphereStack.h rename to samples/TestCpp/Classes/Box2DTestBed/Tests/SphereStack.h diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/TheoJansen.h b/samples/TestCpp/Classes/Box2DTestBed/Tests/TheoJansen.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/TheoJansen.h rename to samples/TestCpp/Classes/Box2DTestBed/Tests/TheoJansen.h diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/Tiles.h b/samples/TestCpp/Classes/Box2DTestBed/Tests/Tiles.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/Tiles.h rename to samples/TestCpp/Classes/Box2DTestBed/Tests/Tiles.h diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/TimeOfImpact.h b/samples/TestCpp/Classes/Box2DTestBed/Tests/TimeOfImpact.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/TimeOfImpact.h rename to samples/TestCpp/Classes/Box2DTestBed/Tests/TimeOfImpact.h diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/Tumbler.h b/samples/TestCpp/Classes/Box2DTestBed/Tests/Tumbler.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/Tumbler.h rename to samples/TestCpp/Classes/Box2DTestBed/Tests/Tumbler.h diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/VaryingFriction.h b/samples/TestCpp/Classes/Box2DTestBed/Tests/VaryingFriction.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/VaryingFriction.h rename to samples/TestCpp/Classes/Box2DTestBed/Tests/VaryingFriction.h diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/VaryingRestitution.h b/samples/TestCpp/Classes/Box2DTestBed/Tests/VaryingRestitution.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/VaryingRestitution.h rename to samples/TestCpp/Classes/Box2DTestBed/Tests/VaryingRestitution.h diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/VerticalStack.h b/samples/TestCpp/Classes/Box2DTestBed/Tests/VerticalStack.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/VerticalStack.h rename to samples/TestCpp/Classes/Box2DTestBed/Tests/VerticalStack.h diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/Web.h b/samples/TestCpp/Classes/Box2DTestBed/Tests/Web.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/Web.h rename to samples/TestCpp/Classes/Box2DTestBed/Tests/Web.h diff --git a/samples/Cpp/TestCpp/Classes/BugsTest/Bug-1159.cpp b/samples/TestCpp/Classes/BugsTest/Bug-1159.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/BugsTest/Bug-1159.cpp rename to samples/TestCpp/Classes/BugsTest/Bug-1159.cpp diff --git a/samples/Cpp/TestCpp/Classes/BugsTest/Bug-1159.h b/samples/TestCpp/Classes/BugsTest/Bug-1159.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/BugsTest/Bug-1159.h rename to samples/TestCpp/Classes/BugsTest/Bug-1159.h diff --git a/samples/Cpp/TestCpp/Classes/BugsTest/Bug-1174.cpp b/samples/TestCpp/Classes/BugsTest/Bug-1174.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/BugsTest/Bug-1174.cpp rename to samples/TestCpp/Classes/BugsTest/Bug-1174.cpp diff --git a/samples/Cpp/TestCpp/Classes/BugsTest/Bug-1174.h b/samples/TestCpp/Classes/BugsTest/Bug-1174.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/BugsTest/Bug-1174.h rename to samples/TestCpp/Classes/BugsTest/Bug-1174.h diff --git a/samples/Cpp/TestCpp/Classes/BugsTest/Bug-350.cpp b/samples/TestCpp/Classes/BugsTest/Bug-350.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/BugsTest/Bug-350.cpp rename to samples/TestCpp/Classes/BugsTest/Bug-350.cpp diff --git a/samples/Cpp/TestCpp/Classes/BugsTest/Bug-350.h b/samples/TestCpp/Classes/BugsTest/Bug-350.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/BugsTest/Bug-350.h rename to samples/TestCpp/Classes/BugsTest/Bug-350.h diff --git a/samples/Cpp/TestCpp/Classes/BugsTest/Bug-422.cpp b/samples/TestCpp/Classes/BugsTest/Bug-422.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/BugsTest/Bug-422.cpp rename to samples/TestCpp/Classes/BugsTest/Bug-422.cpp diff --git a/samples/Cpp/TestCpp/Classes/BugsTest/Bug-422.h b/samples/TestCpp/Classes/BugsTest/Bug-422.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/BugsTest/Bug-422.h rename to samples/TestCpp/Classes/BugsTest/Bug-422.h diff --git a/samples/Cpp/TestCpp/Classes/BugsTest/Bug-458/Bug-458.cpp b/samples/TestCpp/Classes/BugsTest/Bug-458/Bug-458.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/BugsTest/Bug-458/Bug-458.cpp rename to samples/TestCpp/Classes/BugsTest/Bug-458/Bug-458.cpp diff --git a/samples/Cpp/TestCpp/Classes/BugsTest/Bug-458/Bug-458.h b/samples/TestCpp/Classes/BugsTest/Bug-458/Bug-458.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/BugsTest/Bug-458/Bug-458.h rename to samples/TestCpp/Classes/BugsTest/Bug-458/Bug-458.h diff --git a/samples/Cpp/TestCpp/Classes/BugsTest/Bug-458/QuestionContainerSprite.cpp b/samples/TestCpp/Classes/BugsTest/Bug-458/QuestionContainerSprite.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/BugsTest/Bug-458/QuestionContainerSprite.cpp rename to samples/TestCpp/Classes/BugsTest/Bug-458/QuestionContainerSprite.cpp diff --git a/samples/Cpp/TestCpp/Classes/BugsTest/Bug-458/QuestionContainerSprite.h b/samples/TestCpp/Classes/BugsTest/Bug-458/QuestionContainerSprite.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/BugsTest/Bug-458/QuestionContainerSprite.h rename to samples/TestCpp/Classes/BugsTest/Bug-458/QuestionContainerSprite.h diff --git a/samples/Cpp/TestCpp/Classes/BugsTest/Bug-624.cpp b/samples/TestCpp/Classes/BugsTest/Bug-624.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/BugsTest/Bug-624.cpp rename to samples/TestCpp/Classes/BugsTest/Bug-624.cpp diff --git a/samples/Cpp/TestCpp/Classes/BugsTest/Bug-624.h b/samples/TestCpp/Classes/BugsTest/Bug-624.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/BugsTest/Bug-624.h rename to samples/TestCpp/Classes/BugsTest/Bug-624.h diff --git a/samples/Cpp/TestCpp/Classes/BugsTest/Bug-886.cpp b/samples/TestCpp/Classes/BugsTest/Bug-886.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/BugsTest/Bug-886.cpp rename to samples/TestCpp/Classes/BugsTest/Bug-886.cpp diff --git a/samples/Cpp/TestCpp/Classes/BugsTest/Bug-886.h b/samples/TestCpp/Classes/BugsTest/Bug-886.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/BugsTest/Bug-886.h rename to samples/TestCpp/Classes/BugsTest/Bug-886.h diff --git a/samples/Cpp/TestCpp/Classes/BugsTest/Bug-899.cpp b/samples/TestCpp/Classes/BugsTest/Bug-899.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/BugsTest/Bug-899.cpp rename to samples/TestCpp/Classes/BugsTest/Bug-899.cpp diff --git a/samples/Cpp/TestCpp/Classes/BugsTest/Bug-899.h b/samples/TestCpp/Classes/BugsTest/Bug-899.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/BugsTest/Bug-899.h rename to samples/TestCpp/Classes/BugsTest/Bug-899.h diff --git a/samples/Cpp/TestCpp/Classes/BugsTest/Bug-914.cpp b/samples/TestCpp/Classes/BugsTest/Bug-914.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/BugsTest/Bug-914.cpp rename to samples/TestCpp/Classes/BugsTest/Bug-914.cpp diff --git a/samples/Cpp/TestCpp/Classes/BugsTest/Bug-914.h b/samples/TestCpp/Classes/BugsTest/Bug-914.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/BugsTest/Bug-914.h rename to samples/TestCpp/Classes/BugsTest/Bug-914.h diff --git a/samples/Cpp/TestCpp/Classes/BugsTest/BugsTest.cpp b/samples/TestCpp/Classes/BugsTest/BugsTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/BugsTest/BugsTest.cpp rename to samples/TestCpp/Classes/BugsTest/BugsTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/BugsTest/BugsTest.h b/samples/TestCpp/Classes/BugsTest/BugsTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/BugsTest/BugsTest.h rename to samples/TestCpp/Classes/BugsTest/BugsTest.h diff --git a/samples/Cpp/TestCpp/Classes/ChipmunkTest/ChipmunkTest.cpp b/samples/TestCpp/Classes/ChipmunkTest/ChipmunkTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/ChipmunkTest/ChipmunkTest.cpp rename to samples/TestCpp/Classes/ChipmunkTest/ChipmunkTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/ChipmunkTest/ChipmunkTest.h b/samples/TestCpp/Classes/ChipmunkTest/ChipmunkTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/ChipmunkTest/ChipmunkTest.h rename to samples/TestCpp/Classes/ChipmunkTest/ChipmunkTest.h diff --git a/samples/Cpp/TestCpp/Classes/ClickAndMoveTest/ClickAndMoveTest.cpp b/samples/TestCpp/Classes/ClickAndMoveTest/ClickAndMoveTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/ClickAndMoveTest/ClickAndMoveTest.cpp rename to samples/TestCpp/Classes/ClickAndMoveTest/ClickAndMoveTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/ClickAndMoveTest/ClickAndMoveTest.h b/samples/TestCpp/Classes/ClickAndMoveTest/ClickAndMoveTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/ClickAndMoveTest/ClickAndMoveTest.h rename to samples/TestCpp/Classes/ClickAndMoveTest/ClickAndMoveTest.h diff --git a/samples/Cpp/TestCpp/Classes/ClippingNodeTest/ClippingNodeTest.cpp b/samples/TestCpp/Classes/ClippingNodeTest/ClippingNodeTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/ClippingNodeTest/ClippingNodeTest.cpp rename to samples/TestCpp/Classes/ClippingNodeTest/ClippingNodeTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/ClippingNodeTest/ClippingNodeTest.h b/samples/TestCpp/Classes/ClippingNodeTest/ClippingNodeTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/ClippingNodeTest/ClippingNodeTest.h rename to samples/TestCpp/Classes/ClippingNodeTest/ClippingNodeTest.h diff --git a/samples/Cpp/TestCpp/Classes/CocosDenshionTest/CocosDenshionTest.cpp b/samples/TestCpp/Classes/CocosDenshionTest/CocosDenshionTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/CocosDenshionTest/CocosDenshionTest.cpp rename to samples/TestCpp/Classes/CocosDenshionTest/CocosDenshionTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/CocosDenshionTest/CocosDenshionTest.h b/samples/TestCpp/Classes/CocosDenshionTest/CocosDenshionTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/CocosDenshionTest/CocosDenshionTest.h rename to samples/TestCpp/Classes/CocosDenshionTest/CocosDenshionTest.h diff --git a/samples/Cpp/TestCpp/Classes/ConfigurationTest/ConfigurationTest.cpp b/samples/TestCpp/Classes/ConfigurationTest/ConfigurationTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/ConfigurationTest/ConfigurationTest.cpp rename to samples/TestCpp/Classes/ConfigurationTest/ConfigurationTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/ConfigurationTest/ConfigurationTest.h b/samples/TestCpp/Classes/ConfigurationTest/ConfigurationTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/ConfigurationTest/ConfigurationTest.h rename to samples/TestCpp/Classes/ConfigurationTest/ConfigurationTest.h diff --git a/samples/Cpp/TestCpp/Classes/ConsoleTest/ConsoleTest.cpp b/samples/TestCpp/Classes/ConsoleTest/ConsoleTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/ConsoleTest/ConsoleTest.cpp rename to samples/TestCpp/Classes/ConsoleTest/ConsoleTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/ConsoleTest/ConsoleTest.h b/samples/TestCpp/Classes/ConsoleTest/ConsoleTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/ConsoleTest/ConsoleTest.h rename to samples/TestCpp/Classes/ConsoleTest/ConsoleTest.h diff --git a/samples/Cpp/TestCpp/Classes/CurlTest/CurlTest.cpp b/samples/TestCpp/Classes/CurlTest/CurlTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/CurlTest/CurlTest.cpp rename to samples/TestCpp/Classes/CurlTest/CurlTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/CurlTest/CurlTest.h b/samples/TestCpp/Classes/CurlTest/CurlTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/CurlTest/CurlTest.h rename to samples/TestCpp/Classes/CurlTest/CurlTest.h diff --git a/samples/Cpp/TestCpp/Classes/CurrentLanguageTest/CurrentLanguageTest.cpp b/samples/TestCpp/Classes/CurrentLanguageTest/CurrentLanguageTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/CurrentLanguageTest/CurrentLanguageTest.cpp rename to samples/TestCpp/Classes/CurrentLanguageTest/CurrentLanguageTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/CurrentLanguageTest/CurrentLanguageTest.h b/samples/TestCpp/Classes/CurrentLanguageTest/CurrentLanguageTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/CurrentLanguageTest/CurrentLanguageTest.h rename to samples/TestCpp/Classes/CurrentLanguageTest/CurrentLanguageTest.h diff --git a/samples/Cpp/TestCpp/Classes/DataVisitorTest/DataVisitorTest.cpp b/samples/TestCpp/Classes/DataVisitorTest/DataVisitorTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/DataVisitorTest/DataVisitorTest.cpp rename to samples/TestCpp/Classes/DataVisitorTest/DataVisitorTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/DataVisitorTest/DataVisitorTest.h b/samples/TestCpp/Classes/DataVisitorTest/DataVisitorTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/DataVisitorTest/DataVisitorTest.h rename to samples/TestCpp/Classes/DataVisitorTest/DataVisitorTest.h diff --git a/samples/Cpp/TestCpp/Classes/DrawPrimitivesTest/DrawPrimitivesTest.cpp b/samples/TestCpp/Classes/DrawPrimitivesTest/DrawPrimitivesTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/DrawPrimitivesTest/DrawPrimitivesTest.cpp rename to samples/TestCpp/Classes/DrawPrimitivesTest/DrawPrimitivesTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/DrawPrimitivesTest/DrawPrimitivesTest.h b/samples/TestCpp/Classes/DrawPrimitivesTest/DrawPrimitivesTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/DrawPrimitivesTest/DrawPrimitivesTest.h rename to samples/TestCpp/Classes/DrawPrimitivesTest/DrawPrimitivesTest.h diff --git a/samples/Cpp/TestCpp/Classes/EffectsAdvancedTest/EffectsAdvancedTest.cpp b/samples/TestCpp/Classes/EffectsAdvancedTest/EffectsAdvancedTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/EffectsAdvancedTest/EffectsAdvancedTest.cpp rename to samples/TestCpp/Classes/EffectsAdvancedTest/EffectsAdvancedTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/EffectsAdvancedTest/EffectsAdvancedTest.h b/samples/TestCpp/Classes/EffectsAdvancedTest/EffectsAdvancedTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/EffectsAdvancedTest/EffectsAdvancedTest.h rename to samples/TestCpp/Classes/EffectsAdvancedTest/EffectsAdvancedTest.h diff --git a/samples/Cpp/TestCpp/Classes/EffectsTest/EffectsTest.cpp b/samples/TestCpp/Classes/EffectsTest/EffectsTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/EffectsTest/EffectsTest.cpp rename to samples/TestCpp/Classes/EffectsTest/EffectsTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/EffectsTest/EffectsTest.h b/samples/TestCpp/Classes/EffectsTest/EffectsTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/EffectsTest/EffectsTest.h rename to samples/TestCpp/Classes/EffectsTest/EffectsTest.h diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp b/samples/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp rename to samples/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.h b/samples/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.h rename to samples/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.h diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/ComponentsTestScene.cpp b/samples/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/ComponentsTestScene.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/ComponentsTestScene.cpp rename to samples/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/ComponentsTestScene.cpp diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/ComponentsTestScene.h b/samples/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/ComponentsTestScene.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/ComponentsTestScene.h rename to samples/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/ComponentsTestScene.h diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/EnemyController.cpp b/samples/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/EnemyController.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/EnemyController.cpp rename to samples/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/EnemyController.cpp diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/EnemyController.h b/samples/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/EnemyController.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/EnemyController.h rename to samples/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/EnemyController.h diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/GameOverScene.cpp b/samples/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/GameOverScene.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/GameOverScene.cpp rename to samples/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/GameOverScene.cpp diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/GameOverScene.h b/samples/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/GameOverScene.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/GameOverScene.h rename to samples/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/GameOverScene.h diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/PlayerController.cpp b/samples/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/PlayerController.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/PlayerController.cpp rename to samples/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/PlayerController.cpp diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/PlayerController.h b/samples/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/PlayerController.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/PlayerController.h rename to samples/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/PlayerController.h diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/ProjectileController.cpp b/samples/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/ProjectileController.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/ProjectileController.cpp rename to samples/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/ProjectileController.cpp diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/ProjectileController.h b/samples/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/ProjectileController.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/ProjectileController.h rename to samples/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/ProjectileController.h diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/SceneController.cpp b/samples/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/SceneController.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/SceneController.cpp rename to samples/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/SceneController.cpp diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/SceneController.h b/samples/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/SceneController.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/SceneController.h rename to samples/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/SceneController.h diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/CocosGUIScene.cpp b/samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/CocosGUIScene.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/CocosGUIScene.cpp rename to samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/CocosGUIScene.cpp diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/CocosGUIScene.h b/samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/CocosGUIScene.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/CocosGUIScene.h rename to samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/CocosGUIScene.h diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp b/samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp rename to samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest.h b/samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest.h rename to samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest.h diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest.cpp b/samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest.cpp rename to samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest.h b/samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest.h rename to samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest.h diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.cpp b/samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.cpp rename to samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.h b/samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.h rename to samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.h diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILabelAtlasTest/UILabelAtlasTest.cpp b/samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILabelAtlasTest/UILabelAtlasTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILabelAtlasTest/UILabelAtlasTest.cpp rename to samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILabelAtlasTest/UILabelAtlasTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILabelAtlasTest/UILabelAtlasTest.h b/samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILabelAtlasTest/UILabelAtlasTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILabelAtlasTest/UILabelAtlasTest.h rename to samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILabelAtlasTest/UILabelAtlasTest.h diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILabelBMFontTest/UILabelBMFontTest.cpp b/samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILabelBMFontTest/UILabelBMFontTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILabelBMFontTest/UILabelBMFontTest.cpp rename to samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILabelBMFontTest/UILabelBMFontTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILabelBMFontTest/UILabelBMFontTest.h b/samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILabelBMFontTest/UILabelBMFontTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILabelBMFontTest/UILabelBMFontTest.h rename to samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILabelBMFontTest/UILabelBMFontTest.h diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILabelTest/UILabelTest.cpp b/samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILabelTest/UILabelTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILabelTest/UILabelTest.cpp rename to samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILabelTest/UILabelTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILabelTest/UILabelTest.h b/samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILabelTest/UILabelTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILabelTest/UILabelTest.h rename to samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILabelTest/UILabelTest.h diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest.cpp b/samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest.cpp rename to samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest.h b/samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest.h rename to samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest.h diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIListViewTest/UIListViewTest.cpp b/samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIListViewTest/UIListViewTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIListViewTest/UIListViewTest.cpp rename to samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIListViewTest/UIListViewTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIListViewTest/UIListViewTest.h b/samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIListViewTest/UIListViewTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIListViewTest/UIListViewTest.h rename to samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIListViewTest/UIListViewTest.h diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest.cpp b/samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest.cpp rename to samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest.h b/samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest.h rename to samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest.h diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest.cpp b/samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest.cpp rename to samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest.h b/samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest.h rename to samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest.h diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIScene.cpp b/samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIScene.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIScene.cpp rename to samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIScene.cpp diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIScene.h b/samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIScene.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIScene.h rename to samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIScene.h diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UISceneManager.cpp b/samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UISceneManager.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UISceneManager.cpp rename to samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UISceneManager.cpp diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UISceneManager.h b/samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UISceneManager.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UISceneManager.h rename to samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UISceneManager.h diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.cpp b/samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.cpp rename to samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.h b/samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.h rename to samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.h diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UISliderTest/UISliderTest.cpp b/samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UISliderTest/UISliderTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UISliderTest/UISliderTest.cpp rename to samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UISliderTest/UISliderTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UISliderTest/UISliderTest.h b/samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UISliderTest/UISliderTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UISliderTest/UISliderTest.h rename to samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UISliderTest/UISliderTest.h diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.cpp b/samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.cpp rename to samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.h b/samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.h rename to samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.h diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest.cpp b/samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest.cpp rename to samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest.h b/samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest.h rename to samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest.h diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.cpp b/samples/TestCpp/Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.cpp rename to samples/TestCpp/Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.h b/samples/TestCpp/Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.h rename to samples/TestCpp/Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.h diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/EventDef.h b/samples/TestCpp/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/EventDef.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/EventDef.h rename to samples/TestCpp/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/EventDef.h diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/acts.cpp b/samples/TestCpp/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/acts.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/acts.cpp rename to samples/TestCpp/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/acts.cpp diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/acts.h b/samples/TestCpp/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/acts.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/acts.h rename to samples/TestCpp/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/acts.h diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/cons.cpp b/samples/TestCpp/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/cons.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/cons.cpp rename to samples/TestCpp/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/cons.cpp diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/cons.h b/samples/TestCpp/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/cons.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/cons.h rename to samples/TestCpp/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/cons.h diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsLayerLoader.h b/samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsLayerLoader.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsLayerLoader.h rename to samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsLayerLoader.h diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsTestLayer.cpp b/samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsTestLayer.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsTestLayer.cpp rename to samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsTestLayer.cpp diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsTestLayer.h b/samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsTestLayer.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsTestLayer.h rename to samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsTestLayer.h diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayer.cpp b/samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayer.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayer.cpp rename to samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayer.cpp diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayer.h b/samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayer.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayer.h rename to samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayer.h diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayerLoader.h b/samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayerLoader.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayerLoader.h rename to samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayerLoader.h diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/CocosBuilderTest.cpp b/samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/CocosBuilderTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/CocosBuilderTest.cpp rename to samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/CocosBuilderTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/CocosBuilderTest.h b/samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/CocosBuilderTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/CocosBuilderTest.h rename to samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/CocosBuilderTest.h diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayer.cpp b/samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayer.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayer.cpp rename to samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayer.cpp diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayer.h b/samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayer.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayer.h rename to samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayer.h diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayerLoader.h b/samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayerLoader.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayerLoader.h rename to samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayerLoader.h diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/LabelTest/LabelTestLayer.h b/samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/LabelTest/LabelTestLayer.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/LabelTest/LabelTestLayer.h rename to samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/LabelTest/LabelTestLayer.h diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/LabelTest/LabelTestLayerLoader.h b/samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/LabelTest/LabelTestLayerLoader.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/LabelTest/LabelTestLayerLoader.h rename to samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/LabelTest/LabelTestLayerLoader.h diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayer.cpp b/samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayer.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayer.cpp rename to samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayer.cpp diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayer.h b/samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayer.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayer.h rename to samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayer.h diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayerLoader.h b/samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayerLoader.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayerLoader.h rename to samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayerLoader.h diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/ParticleSystemTest/ParticleSystemTestLayer.h b/samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/ParticleSystemTest/ParticleSystemTestLayer.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/ParticleSystemTest/ParticleSystemTestLayer.h rename to samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/ParticleSystemTest/ParticleSystemTestLayer.h diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/ParticleSystemTest/ParticleSystemTestLayerLoader.h b/samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/ParticleSystemTest/ParticleSystemTestLayerLoader.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/ParticleSystemTest/ParticleSystemTestLayerLoader.h rename to samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/ParticleSystemTest/ParticleSystemTestLayerLoader.h diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/ScrollViewTest/ScrollViewTestLayer.h b/samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/ScrollViewTest/ScrollViewTestLayer.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/ScrollViewTest/ScrollViewTestLayer.h rename to samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/ScrollViewTest/ScrollViewTestLayer.h diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/ScrollViewTest/ScrollViewTestLayerLoader.h b/samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/ScrollViewTest/ScrollViewTestLayerLoader.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/ScrollViewTest/ScrollViewTestLayerLoader.h rename to samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/ScrollViewTest/ScrollViewTestLayerLoader.h diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/SpriteTest/SpriteTestLayer.h b/samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/SpriteTest/SpriteTestLayer.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/SpriteTest/SpriteTestLayer.h rename to samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/SpriteTest/SpriteTestLayer.h diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/SpriteTest/SpriteTestLayerLoader.h b/samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/SpriteTest/SpriteTestLayerLoader.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/SpriteTest/SpriteTestLayerLoader.h rename to samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/SpriteTest/SpriteTestLayerLoader.h diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayer.cpp b/samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayer.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayer.cpp rename to samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayer.cpp diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayer.h b/samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayer.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayer.h rename to samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayer.h diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayerLoader.h b/samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayerLoader.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayerLoader.h rename to samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayerLoader.h diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackLayerLoader.h b/samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackLayerLoader.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackLayerLoader.h rename to samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackLayerLoader.h diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackTestLayer.cpp b/samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackTestLayer.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackTestLayer.cpp rename to samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackTestLayer.cpp diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackTestLayer.h b/samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackTestLayer.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackTestLayer.h rename to samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackTestLayer.h diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlButtonTest/CCControlButtonTest.cpp b/samples/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlButtonTest/CCControlButtonTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlButtonTest/CCControlButtonTest.cpp rename to samples/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlButtonTest/CCControlButtonTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlButtonTest/CCControlButtonTest.h b/samples/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlButtonTest/CCControlButtonTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlButtonTest/CCControlButtonTest.h rename to samples/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlButtonTest/CCControlButtonTest.h diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlColourPicker/CCControlColourPickerTest.cpp b/samples/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlColourPicker/CCControlColourPickerTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlColourPicker/CCControlColourPickerTest.cpp rename to samples/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlColourPicker/CCControlColourPickerTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlColourPicker/CCControlColourPickerTest.h b/samples/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlColourPicker/CCControlColourPickerTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlColourPicker/CCControlColourPickerTest.h rename to samples/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlColourPicker/CCControlColourPickerTest.h diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlPotentiometerTest/CCControlPotentiometerTest.cpp b/samples/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlPotentiometerTest/CCControlPotentiometerTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlPotentiometerTest/CCControlPotentiometerTest.cpp rename to samples/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlPotentiometerTest/CCControlPotentiometerTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlPotentiometerTest/CCControlPotentiometerTest.h b/samples/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlPotentiometerTest/CCControlPotentiometerTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlPotentiometerTest/CCControlPotentiometerTest.h rename to samples/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlPotentiometerTest/CCControlPotentiometerTest.h diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlScene.cpp b/samples/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlScene.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlScene.cpp rename to samples/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlScene.cpp diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlScene.h b/samples/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlScene.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlScene.h rename to samples/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlScene.h diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSceneManager.cpp b/samples/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSceneManager.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSceneManager.cpp rename to samples/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSceneManager.cpp diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSceneManager.h b/samples/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSceneManager.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSceneManager.h rename to samples/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSceneManager.h diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSliderTest/CCControlSliderTest.cpp b/samples/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSliderTest/CCControlSliderTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSliderTest/CCControlSliderTest.cpp rename to samples/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSliderTest/CCControlSliderTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSliderTest/CCControlSliderTest.h b/samples/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSliderTest/CCControlSliderTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSliderTest/CCControlSliderTest.h rename to samples/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSliderTest/CCControlSliderTest.h diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlStepperTest/CCControlStepperTest.cpp b/samples/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlStepperTest/CCControlStepperTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlStepperTest/CCControlStepperTest.cpp rename to samples/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlStepperTest/CCControlStepperTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlStepperTest/CCControlStepperTest.h b/samples/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlStepperTest/CCControlStepperTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlStepperTest/CCControlStepperTest.h rename to samples/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlStepperTest/CCControlStepperTest.h diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSwitchTest/CCControlSwitchTest.cpp b/samples/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSwitchTest/CCControlSwitchTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSwitchTest/CCControlSwitchTest.cpp rename to samples/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSwitchTest/CCControlSwitchTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSwitchTest/CCControlSwitchTest.h b/samples/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSwitchTest/CCControlSwitchTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSwitchTest/CCControlSwitchTest.h rename to samples/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSwitchTest/CCControlSwitchTest.h diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/EditBoxTest/EditBoxTest.cpp b/samples/TestCpp/Classes/ExtensionsTest/EditBoxTest/EditBoxTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/EditBoxTest/EditBoxTest.cpp rename to samples/TestCpp/Classes/ExtensionsTest/EditBoxTest/EditBoxTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/EditBoxTest/EditBoxTest.h b/samples/TestCpp/Classes/ExtensionsTest/EditBoxTest/EditBoxTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/EditBoxTest/EditBoxTest.h rename to samples/TestCpp/Classes/ExtensionsTest/EditBoxTest/EditBoxTest.h diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/ExtensionsTest.cpp b/samples/TestCpp/Classes/ExtensionsTest/ExtensionsTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/ExtensionsTest.cpp rename to samples/TestCpp/Classes/ExtensionsTest/ExtensionsTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/ExtensionsTest.h b/samples/TestCpp/Classes/ExtensionsTest/ExtensionsTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/ExtensionsTest.h rename to samples/TestCpp/Classes/ExtensionsTest/ExtensionsTest.h diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/NetworkTest/HttpClientTest.cpp b/samples/TestCpp/Classes/ExtensionsTest/NetworkTest/HttpClientTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/NetworkTest/HttpClientTest.cpp rename to samples/TestCpp/Classes/ExtensionsTest/NetworkTest/HttpClientTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/NetworkTest/HttpClientTest.h b/samples/TestCpp/Classes/ExtensionsTest/NetworkTest/HttpClientTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/NetworkTest/HttpClientTest.h rename to samples/TestCpp/Classes/ExtensionsTest/NetworkTest/HttpClientTest.h diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/NetworkTest/SocketIOTest.cpp b/samples/TestCpp/Classes/ExtensionsTest/NetworkTest/SocketIOTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/NetworkTest/SocketIOTest.cpp rename to samples/TestCpp/Classes/ExtensionsTest/NetworkTest/SocketIOTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/NetworkTest/SocketIOTest.h b/samples/TestCpp/Classes/ExtensionsTest/NetworkTest/SocketIOTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/NetworkTest/SocketIOTest.h rename to samples/TestCpp/Classes/ExtensionsTest/NetworkTest/SocketIOTest.h diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/NetworkTest/WebSocketTest.cpp b/samples/TestCpp/Classes/ExtensionsTest/NetworkTest/WebSocketTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/NetworkTest/WebSocketTest.cpp rename to samples/TestCpp/Classes/ExtensionsTest/NetworkTest/WebSocketTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/NetworkTest/WebSocketTest.h b/samples/TestCpp/Classes/ExtensionsTest/NetworkTest/WebSocketTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/NetworkTest/WebSocketTest.h rename to samples/TestCpp/Classes/ExtensionsTest/NetworkTest/WebSocketTest.h diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/NotificationCenterTest/NotificationCenterTest.cpp b/samples/TestCpp/Classes/ExtensionsTest/NotificationCenterTest/NotificationCenterTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/NotificationCenterTest/NotificationCenterTest.cpp rename to samples/TestCpp/Classes/ExtensionsTest/NotificationCenterTest/NotificationCenterTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/NotificationCenterTest/NotificationCenterTest.h b/samples/TestCpp/Classes/ExtensionsTest/NotificationCenterTest/NotificationCenterTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/NotificationCenterTest/NotificationCenterTest.h rename to samples/TestCpp/Classes/ExtensionsTest/NotificationCenterTest/NotificationCenterTest.h diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/Scale9SpriteTest/Scale9SpriteTest.cpp b/samples/TestCpp/Classes/ExtensionsTest/Scale9SpriteTest/Scale9SpriteTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/Scale9SpriteTest/Scale9SpriteTest.cpp rename to samples/TestCpp/Classes/ExtensionsTest/Scale9SpriteTest/Scale9SpriteTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/Scale9SpriteTest/Scale9SpriteTest.h b/samples/TestCpp/Classes/ExtensionsTest/Scale9SpriteTest/Scale9SpriteTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/Scale9SpriteTest/Scale9SpriteTest.h rename to samples/TestCpp/Classes/ExtensionsTest/Scale9SpriteTest/Scale9SpriteTest.h diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/TableViewTest/CustomTableViewCell.cpp b/samples/TestCpp/Classes/ExtensionsTest/TableViewTest/CustomTableViewCell.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/TableViewTest/CustomTableViewCell.cpp rename to samples/TestCpp/Classes/ExtensionsTest/TableViewTest/CustomTableViewCell.cpp diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/TableViewTest/CustomTableViewCell.h b/samples/TestCpp/Classes/ExtensionsTest/TableViewTest/CustomTableViewCell.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/TableViewTest/CustomTableViewCell.h rename to samples/TestCpp/Classes/ExtensionsTest/TableViewTest/CustomTableViewCell.h diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/TableViewTest/TableViewTestScene.cpp b/samples/TestCpp/Classes/ExtensionsTest/TableViewTest/TableViewTestScene.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/TableViewTest/TableViewTestScene.cpp rename to samples/TestCpp/Classes/ExtensionsTest/TableViewTest/TableViewTestScene.cpp diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/TableViewTest/TableViewTestScene.h b/samples/TestCpp/Classes/ExtensionsTest/TableViewTest/TableViewTestScene.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/TableViewTest/TableViewTestScene.h rename to samples/TestCpp/Classes/ExtensionsTest/TableViewTest/TableViewTestScene.h diff --git a/samples/Cpp/TestCpp/Classes/FileUtilsTest/FileUtilsTest.cpp b/samples/TestCpp/Classes/FileUtilsTest/FileUtilsTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/FileUtilsTest/FileUtilsTest.cpp rename to samples/TestCpp/Classes/FileUtilsTest/FileUtilsTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/FileUtilsTest/FileUtilsTest.h b/samples/TestCpp/Classes/FileUtilsTest/FileUtilsTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/FileUtilsTest/FileUtilsTest.h rename to samples/TestCpp/Classes/FileUtilsTest/FileUtilsTest.h diff --git a/samples/Cpp/TestCpp/Classes/FontTest/FontTest.cpp b/samples/TestCpp/Classes/FontTest/FontTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/FontTest/FontTest.cpp rename to samples/TestCpp/Classes/FontTest/FontTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/FontTest/FontTest.h b/samples/TestCpp/Classes/FontTest/FontTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/FontTest/FontTest.h rename to samples/TestCpp/Classes/FontTest/FontTest.h diff --git a/samples/Cpp/TestCpp/Classes/InputTest/MouseTest.cpp b/samples/TestCpp/Classes/InputTest/MouseTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/InputTest/MouseTest.cpp rename to samples/TestCpp/Classes/InputTest/MouseTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/InputTest/MouseTest.h b/samples/TestCpp/Classes/InputTest/MouseTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/InputTest/MouseTest.h rename to samples/TestCpp/Classes/InputTest/MouseTest.h diff --git a/samples/Cpp/TestCpp/Classes/IntervalTest/IntervalTest.cpp b/samples/TestCpp/Classes/IntervalTest/IntervalTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/IntervalTest/IntervalTest.cpp rename to samples/TestCpp/Classes/IntervalTest/IntervalTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/IntervalTest/IntervalTest.h b/samples/TestCpp/Classes/IntervalTest/IntervalTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/IntervalTest/IntervalTest.h rename to samples/TestCpp/Classes/IntervalTest/IntervalTest.h diff --git a/samples/Cpp/TestCpp/Classes/KeyboardTest/KeyboardTest.cpp b/samples/TestCpp/Classes/KeyboardTest/KeyboardTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/KeyboardTest/KeyboardTest.cpp rename to samples/TestCpp/Classes/KeyboardTest/KeyboardTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/KeyboardTest/KeyboardTest.h b/samples/TestCpp/Classes/KeyboardTest/KeyboardTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/KeyboardTest/KeyboardTest.h rename to samples/TestCpp/Classes/KeyboardTest/KeyboardTest.h diff --git a/samples/Cpp/TestCpp/Classes/KeypadTest/KeypadTest.cpp b/samples/TestCpp/Classes/KeypadTest/KeypadTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/KeypadTest/KeypadTest.cpp rename to samples/TestCpp/Classes/KeypadTest/KeypadTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/KeypadTest/KeypadTest.h b/samples/TestCpp/Classes/KeypadTest/KeypadTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/KeypadTest/KeypadTest.h rename to samples/TestCpp/Classes/KeypadTest/KeypadTest.h diff --git a/samples/Cpp/TestCpp/Classes/LabelTest/LabelTest.cpp b/samples/TestCpp/Classes/LabelTest/LabelTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/LabelTest/LabelTest.cpp rename to samples/TestCpp/Classes/LabelTest/LabelTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/LabelTest/LabelTest.h b/samples/TestCpp/Classes/LabelTest/LabelTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/LabelTest/LabelTest.h rename to samples/TestCpp/Classes/LabelTest/LabelTest.h diff --git a/samples/Cpp/TestCpp/Classes/LabelTest/LabelTestNew.cpp b/samples/TestCpp/Classes/LabelTest/LabelTestNew.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/LabelTest/LabelTestNew.cpp rename to samples/TestCpp/Classes/LabelTest/LabelTestNew.cpp diff --git a/samples/Cpp/TestCpp/Classes/LabelTest/LabelTestNew.h b/samples/TestCpp/Classes/LabelTest/LabelTestNew.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/LabelTest/LabelTestNew.h rename to samples/TestCpp/Classes/LabelTest/LabelTestNew.h diff --git a/samples/Cpp/TestCpp/Classes/LayerTest/LayerTest.cpp b/samples/TestCpp/Classes/LayerTest/LayerTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/LayerTest/LayerTest.cpp rename to samples/TestCpp/Classes/LayerTest/LayerTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/LayerTest/LayerTest.h b/samples/TestCpp/Classes/LayerTest/LayerTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/LayerTest/LayerTest.h rename to samples/TestCpp/Classes/LayerTest/LayerTest.h diff --git a/samples/Cpp/TestCpp/Classes/MenuTest/MenuTest.cpp b/samples/TestCpp/Classes/MenuTest/MenuTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/MenuTest/MenuTest.cpp rename to samples/TestCpp/Classes/MenuTest/MenuTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/MenuTest/MenuTest.h b/samples/TestCpp/Classes/MenuTest/MenuTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/MenuTest/MenuTest.h rename to samples/TestCpp/Classes/MenuTest/MenuTest.h diff --git a/samples/Cpp/TestCpp/Classes/MotionStreakTest/MotionStreakTest.cpp b/samples/TestCpp/Classes/MotionStreakTest/MotionStreakTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/MotionStreakTest/MotionStreakTest.cpp rename to samples/TestCpp/Classes/MotionStreakTest/MotionStreakTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/MotionStreakTest/MotionStreakTest.h b/samples/TestCpp/Classes/MotionStreakTest/MotionStreakTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/MotionStreakTest/MotionStreakTest.h rename to samples/TestCpp/Classes/MotionStreakTest/MotionStreakTest.h diff --git a/samples/Cpp/TestCpp/Classes/MutiTouchTest/MutiTouchTest.cpp b/samples/TestCpp/Classes/MutiTouchTest/MutiTouchTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/MutiTouchTest/MutiTouchTest.cpp rename to samples/TestCpp/Classes/MutiTouchTest/MutiTouchTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/MutiTouchTest/MutiTouchTest.h b/samples/TestCpp/Classes/MutiTouchTest/MutiTouchTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/MutiTouchTest/MutiTouchTest.h rename to samples/TestCpp/Classes/MutiTouchTest/MutiTouchTest.h diff --git a/samples/Cpp/TestCpp/Classes/NewEventDispatcherTest/NewEventDispatcherTest.cpp b/samples/TestCpp/Classes/NewEventDispatcherTest/NewEventDispatcherTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/NewEventDispatcherTest/NewEventDispatcherTest.cpp rename to samples/TestCpp/Classes/NewEventDispatcherTest/NewEventDispatcherTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/NewEventDispatcherTest/NewEventDispatcherTest.h b/samples/TestCpp/Classes/NewEventDispatcherTest/NewEventDispatcherTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/NewEventDispatcherTest/NewEventDispatcherTest.h rename to samples/TestCpp/Classes/NewEventDispatcherTest/NewEventDispatcherTest.h diff --git a/samples/Cpp/TestCpp/Classes/NewRendererTest/NewRendererTest.cpp b/samples/TestCpp/Classes/NewRendererTest/NewRendererTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/NewRendererTest/NewRendererTest.cpp rename to samples/TestCpp/Classes/NewRendererTest/NewRendererTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/NewRendererTest/NewRendererTest.h b/samples/TestCpp/Classes/NewRendererTest/NewRendererTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/NewRendererTest/NewRendererTest.h rename to samples/TestCpp/Classes/NewRendererTest/NewRendererTest.h diff --git a/samples/Cpp/TestCpp/Classes/NodeTest/NodeTest.cpp b/samples/TestCpp/Classes/NodeTest/NodeTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/NodeTest/NodeTest.cpp rename to samples/TestCpp/Classes/NodeTest/NodeTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/NodeTest/NodeTest.h b/samples/TestCpp/Classes/NodeTest/NodeTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/NodeTest/NodeTest.h rename to samples/TestCpp/Classes/NodeTest/NodeTest.h diff --git a/samples/Cpp/TestCpp/Classes/ParallaxTest/ParallaxTest.cpp b/samples/TestCpp/Classes/ParallaxTest/ParallaxTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/ParallaxTest/ParallaxTest.cpp rename to samples/TestCpp/Classes/ParallaxTest/ParallaxTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/ParallaxTest/ParallaxTest.h b/samples/TestCpp/Classes/ParallaxTest/ParallaxTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/ParallaxTest/ParallaxTest.h rename to samples/TestCpp/Classes/ParallaxTest/ParallaxTest.h diff --git a/samples/Cpp/TestCpp/Classes/ParticleTest/ParticleTest.cpp b/samples/TestCpp/Classes/ParticleTest/ParticleTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/ParticleTest/ParticleTest.cpp rename to samples/TestCpp/Classes/ParticleTest/ParticleTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/ParticleTest/ParticleTest.h b/samples/TestCpp/Classes/ParticleTest/ParticleTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/ParticleTest/ParticleTest.h rename to samples/TestCpp/Classes/ParticleTest/ParticleTest.h diff --git a/samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceAllocTest.cpp b/samples/TestCpp/Classes/PerformanceTest/PerformanceAllocTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceAllocTest.cpp rename to samples/TestCpp/Classes/PerformanceTest/PerformanceAllocTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceAllocTest.h b/samples/TestCpp/Classes/PerformanceTest/PerformanceAllocTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceAllocTest.h rename to samples/TestCpp/Classes/PerformanceTest/PerformanceAllocTest.h diff --git a/samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceContainerTest.cpp b/samples/TestCpp/Classes/PerformanceTest/PerformanceContainerTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceContainerTest.cpp rename to samples/TestCpp/Classes/PerformanceTest/PerformanceContainerTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceContainerTest.h b/samples/TestCpp/Classes/PerformanceTest/PerformanceContainerTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceContainerTest.h rename to samples/TestCpp/Classes/PerformanceTest/PerformanceContainerTest.h diff --git a/samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceEventDispatcherTest.cpp b/samples/TestCpp/Classes/PerformanceTest/PerformanceEventDispatcherTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceEventDispatcherTest.cpp rename to samples/TestCpp/Classes/PerformanceTest/PerformanceEventDispatcherTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceEventDispatcherTest.h b/samples/TestCpp/Classes/PerformanceTest/PerformanceEventDispatcherTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceEventDispatcherTest.h rename to samples/TestCpp/Classes/PerformanceTest/PerformanceEventDispatcherTest.h diff --git a/samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceLabelTest.cpp b/samples/TestCpp/Classes/PerformanceTest/PerformanceLabelTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceLabelTest.cpp rename to samples/TestCpp/Classes/PerformanceTest/PerformanceLabelTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceLabelTest.h b/samples/TestCpp/Classes/PerformanceTest/PerformanceLabelTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceLabelTest.h rename to samples/TestCpp/Classes/PerformanceTest/PerformanceLabelTest.h diff --git a/samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceNodeChildrenTest.cpp b/samples/TestCpp/Classes/PerformanceTest/PerformanceNodeChildrenTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceNodeChildrenTest.cpp rename to samples/TestCpp/Classes/PerformanceTest/PerformanceNodeChildrenTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceNodeChildrenTest.h b/samples/TestCpp/Classes/PerformanceTest/PerformanceNodeChildrenTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceNodeChildrenTest.h rename to samples/TestCpp/Classes/PerformanceTest/PerformanceNodeChildrenTest.h diff --git a/samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceParticleTest.cpp b/samples/TestCpp/Classes/PerformanceTest/PerformanceParticleTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceParticleTest.cpp rename to samples/TestCpp/Classes/PerformanceTest/PerformanceParticleTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceParticleTest.h b/samples/TestCpp/Classes/PerformanceTest/PerformanceParticleTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceParticleTest.h rename to samples/TestCpp/Classes/PerformanceTest/PerformanceParticleTest.h diff --git a/samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceRendererTest.cpp b/samples/TestCpp/Classes/PerformanceTest/PerformanceRendererTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceRendererTest.cpp rename to samples/TestCpp/Classes/PerformanceTest/PerformanceRendererTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceRendererTest.h b/samples/TestCpp/Classes/PerformanceTest/PerformanceRendererTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceRendererTest.h rename to samples/TestCpp/Classes/PerformanceTest/PerformanceRendererTest.h diff --git a/samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceSpriteTest.cpp b/samples/TestCpp/Classes/PerformanceTest/PerformanceSpriteTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceSpriteTest.cpp rename to samples/TestCpp/Classes/PerformanceTest/PerformanceSpriteTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceSpriteTest.h b/samples/TestCpp/Classes/PerformanceTest/PerformanceSpriteTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceSpriteTest.h rename to samples/TestCpp/Classes/PerformanceTest/PerformanceSpriteTest.h diff --git a/samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceTest.cpp b/samples/TestCpp/Classes/PerformanceTest/PerformanceTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceTest.cpp rename to samples/TestCpp/Classes/PerformanceTest/PerformanceTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceTest.h b/samples/TestCpp/Classes/PerformanceTest/PerformanceTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceTest.h rename to samples/TestCpp/Classes/PerformanceTest/PerformanceTest.h diff --git a/samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceTextureTest.cpp b/samples/TestCpp/Classes/PerformanceTest/PerformanceTextureTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceTextureTest.cpp rename to samples/TestCpp/Classes/PerformanceTest/PerformanceTextureTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceTextureTest.h b/samples/TestCpp/Classes/PerformanceTest/PerformanceTextureTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceTextureTest.h rename to samples/TestCpp/Classes/PerformanceTest/PerformanceTextureTest.h diff --git a/samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceTouchesTest.cpp b/samples/TestCpp/Classes/PerformanceTest/PerformanceTouchesTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceTouchesTest.cpp rename to samples/TestCpp/Classes/PerformanceTest/PerformanceTouchesTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceTouchesTest.h b/samples/TestCpp/Classes/PerformanceTest/PerformanceTouchesTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceTouchesTest.h rename to samples/TestCpp/Classes/PerformanceTest/PerformanceTouchesTest.h diff --git a/samples/Cpp/TestCpp/Classes/PhysicsTest/PhysicsTest.cpp b/samples/TestCpp/Classes/PhysicsTest/PhysicsTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/PhysicsTest/PhysicsTest.cpp rename to samples/TestCpp/Classes/PhysicsTest/PhysicsTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/PhysicsTest/PhysicsTest.h b/samples/TestCpp/Classes/PhysicsTest/PhysicsTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/PhysicsTest/PhysicsTest.h rename to samples/TestCpp/Classes/PhysicsTest/PhysicsTest.h diff --git a/samples/Cpp/TestCpp/Classes/ReleasePoolTest/ReleasePoolTest.cpp b/samples/TestCpp/Classes/ReleasePoolTest/ReleasePoolTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/ReleasePoolTest/ReleasePoolTest.cpp rename to samples/TestCpp/Classes/ReleasePoolTest/ReleasePoolTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/ReleasePoolTest/ReleasePoolTest.h b/samples/TestCpp/Classes/ReleasePoolTest/ReleasePoolTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/ReleasePoolTest/ReleasePoolTest.h rename to samples/TestCpp/Classes/ReleasePoolTest/ReleasePoolTest.h diff --git a/samples/Cpp/TestCpp/Classes/RenderTextureTest/RenderTextureTest.cpp b/samples/TestCpp/Classes/RenderTextureTest/RenderTextureTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/RenderTextureTest/RenderTextureTest.cpp rename to samples/TestCpp/Classes/RenderTextureTest/RenderTextureTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/RenderTextureTest/RenderTextureTest.h b/samples/TestCpp/Classes/RenderTextureTest/RenderTextureTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/RenderTextureTest/RenderTextureTest.h rename to samples/TestCpp/Classes/RenderTextureTest/RenderTextureTest.h diff --git a/samples/Cpp/TestCpp/Classes/RotateWorldTest/RotateWorldTest.cpp b/samples/TestCpp/Classes/RotateWorldTest/RotateWorldTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/RotateWorldTest/RotateWorldTest.cpp rename to samples/TestCpp/Classes/RotateWorldTest/RotateWorldTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/RotateWorldTest/RotateWorldTest.h b/samples/TestCpp/Classes/RotateWorldTest/RotateWorldTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/RotateWorldTest/RotateWorldTest.h rename to samples/TestCpp/Classes/RotateWorldTest/RotateWorldTest.h diff --git a/samples/Cpp/TestCpp/Classes/SceneTest/SceneTest.cpp b/samples/TestCpp/Classes/SceneTest/SceneTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/SceneTest/SceneTest.cpp rename to samples/TestCpp/Classes/SceneTest/SceneTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/SceneTest/SceneTest.h b/samples/TestCpp/Classes/SceneTest/SceneTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/SceneTest/SceneTest.h rename to samples/TestCpp/Classes/SceneTest/SceneTest.h diff --git a/samples/Cpp/TestCpp/Classes/SchedulerTest/SchedulerTest.cpp b/samples/TestCpp/Classes/SchedulerTest/SchedulerTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/SchedulerTest/SchedulerTest.cpp rename to samples/TestCpp/Classes/SchedulerTest/SchedulerTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/SchedulerTest/SchedulerTest.h b/samples/TestCpp/Classes/SchedulerTest/SchedulerTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/SchedulerTest/SchedulerTest.h rename to samples/TestCpp/Classes/SchedulerTest/SchedulerTest.h diff --git a/samples/Cpp/TestCpp/Classes/ShaderTest/ShaderTest.cpp b/samples/TestCpp/Classes/ShaderTest/ShaderTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/ShaderTest/ShaderTest.cpp rename to samples/TestCpp/Classes/ShaderTest/ShaderTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/ShaderTest/ShaderTest.h b/samples/TestCpp/Classes/ShaderTest/ShaderTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/ShaderTest/ShaderTest.h rename to samples/TestCpp/Classes/ShaderTest/ShaderTest.h diff --git a/samples/Cpp/TestCpp/Classes/ShaderTest/ShaderTest2.cpp b/samples/TestCpp/Classes/ShaderTest/ShaderTest2.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/ShaderTest/ShaderTest2.cpp rename to samples/TestCpp/Classes/ShaderTest/ShaderTest2.cpp diff --git a/samples/Cpp/TestCpp/Classes/ShaderTest/ShaderTest2.h b/samples/TestCpp/Classes/ShaderTest/ShaderTest2.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/ShaderTest/ShaderTest2.h rename to samples/TestCpp/Classes/ShaderTest/ShaderTest2.h diff --git a/samples/Cpp/TestCpp/Classes/SpineTest/SpineTest.cpp b/samples/TestCpp/Classes/SpineTest/SpineTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/SpineTest/SpineTest.cpp rename to samples/TestCpp/Classes/SpineTest/SpineTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/SpineTest/SpineTest.h b/samples/TestCpp/Classes/SpineTest/SpineTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/SpineTest/SpineTest.h rename to samples/TestCpp/Classes/SpineTest/SpineTest.h diff --git a/samples/Cpp/TestCpp/Classes/SpriteTest/SpriteTest.cpp.REMOVED.git-id b/samples/TestCpp/Classes/SpriteTest/SpriteTest.cpp.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Classes/SpriteTest/SpriteTest.cpp.REMOVED.git-id rename to samples/TestCpp/Classes/SpriteTest/SpriteTest.cpp.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Classes/SpriteTest/SpriteTest.h b/samples/TestCpp/Classes/SpriteTest/SpriteTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/SpriteTest/SpriteTest.h rename to samples/TestCpp/Classes/SpriteTest/SpriteTest.h diff --git a/samples/Cpp/TestCpp/Classes/TextInputTest/TextInputTest.cpp b/samples/TestCpp/Classes/TextInputTest/TextInputTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/TextInputTest/TextInputTest.cpp rename to samples/TestCpp/Classes/TextInputTest/TextInputTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/TextInputTest/TextInputTest.h b/samples/TestCpp/Classes/TextInputTest/TextInputTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/TextInputTest/TextInputTest.h rename to samples/TestCpp/Classes/TextInputTest/TextInputTest.h diff --git a/samples/Cpp/TestCpp/Classes/Texture2dTest/Texture2dTest.cpp b/samples/TestCpp/Classes/Texture2dTest/Texture2dTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/Texture2dTest/Texture2dTest.cpp rename to samples/TestCpp/Classes/Texture2dTest/Texture2dTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/Texture2dTest/Texture2dTest.h b/samples/TestCpp/Classes/Texture2dTest/Texture2dTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/Texture2dTest/Texture2dTest.h rename to samples/TestCpp/Classes/Texture2dTest/Texture2dTest.h diff --git a/samples/Cpp/TestCpp/Classes/TextureCacheTest/TextureCacheTest.cpp b/samples/TestCpp/Classes/TextureCacheTest/TextureCacheTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/TextureCacheTest/TextureCacheTest.cpp rename to samples/TestCpp/Classes/TextureCacheTest/TextureCacheTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/TextureCacheTest/TextureCacheTest.h b/samples/TestCpp/Classes/TextureCacheTest/TextureCacheTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/TextureCacheTest/TextureCacheTest.h rename to samples/TestCpp/Classes/TextureCacheTest/TextureCacheTest.h diff --git a/samples/Cpp/TestCpp/Classes/TexturePackerEncryptionTest/TextureAtlasEncryptionTest.cpp b/samples/TestCpp/Classes/TexturePackerEncryptionTest/TextureAtlasEncryptionTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/TexturePackerEncryptionTest/TextureAtlasEncryptionTest.cpp rename to samples/TestCpp/Classes/TexturePackerEncryptionTest/TextureAtlasEncryptionTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/TexturePackerEncryptionTest/TextureAtlasEncryptionTest.h b/samples/TestCpp/Classes/TexturePackerEncryptionTest/TextureAtlasEncryptionTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/TexturePackerEncryptionTest/TextureAtlasEncryptionTest.h rename to samples/TestCpp/Classes/TexturePackerEncryptionTest/TextureAtlasEncryptionTest.h diff --git a/samples/Cpp/TestCpp/Classes/TileMapTest/TileMapTest.cpp b/samples/TestCpp/Classes/TileMapTest/TileMapTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/TileMapTest/TileMapTest.cpp rename to samples/TestCpp/Classes/TileMapTest/TileMapTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/TileMapTest/TileMapTest.h b/samples/TestCpp/Classes/TileMapTest/TileMapTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/TileMapTest/TileMapTest.h rename to samples/TestCpp/Classes/TileMapTest/TileMapTest.h diff --git a/samples/Cpp/TestCpp/Classes/TouchesTest/Ball.cpp b/samples/TestCpp/Classes/TouchesTest/Ball.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/TouchesTest/Ball.cpp rename to samples/TestCpp/Classes/TouchesTest/Ball.cpp diff --git a/samples/Cpp/TestCpp/Classes/TouchesTest/Ball.h b/samples/TestCpp/Classes/TouchesTest/Ball.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/TouchesTest/Ball.h rename to samples/TestCpp/Classes/TouchesTest/Ball.h diff --git a/samples/Cpp/TestCpp/Classes/TouchesTest/Paddle.cpp b/samples/TestCpp/Classes/TouchesTest/Paddle.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/TouchesTest/Paddle.cpp rename to samples/TestCpp/Classes/TouchesTest/Paddle.cpp diff --git a/samples/Cpp/TestCpp/Classes/TouchesTest/Paddle.h b/samples/TestCpp/Classes/TouchesTest/Paddle.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/TouchesTest/Paddle.h rename to samples/TestCpp/Classes/TouchesTest/Paddle.h diff --git a/samples/Cpp/TestCpp/Classes/TouchesTest/TouchesTest.cpp b/samples/TestCpp/Classes/TouchesTest/TouchesTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/TouchesTest/TouchesTest.cpp rename to samples/TestCpp/Classes/TouchesTest/TouchesTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/TouchesTest/TouchesTest.h b/samples/TestCpp/Classes/TouchesTest/TouchesTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/TouchesTest/TouchesTest.h rename to samples/TestCpp/Classes/TouchesTest/TouchesTest.h diff --git a/samples/Cpp/TestCpp/Classes/TransitionsTest/TransitionsTest.cpp b/samples/TestCpp/Classes/TransitionsTest/TransitionsTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/TransitionsTest/TransitionsTest.cpp rename to samples/TestCpp/Classes/TransitionsTest/TransitionsTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/TransitionsTest/TransitionsTest.h b/samples/TestCpp/Classes/TransitionsTest/TransitionsTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/TransitionsTest/TransitionsTest.h rename to samples/TestCpp/Classes/TransitionsTest/TransitionsTest.h diff --git a/samples/Cpp/TestCpp/Classes/UnitTest/UnitTest.cpp b/samples/TestCpp/Classes/UnitTest/UnitTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/UnitTest/UnitTest.cpp rename to samples/TestCpp/Classes/UnitTest/UnitTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/UnitTest/UnitTest.h b/samples/TestCpp/Classes/UnitTest/UnitTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/UnitTest/UnitTest.h rename to samples/TestCpp/Classes/UnitTest/UnitTest.h diff --git a/samples/Cpp/TestCpp/Classes/UserDefaultTest/UserDefaultTest.cpp b/samples/TestCpp/Classes/UserDefaultTest/UserDefaultTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/UserDefaultTest/UserDefaultTest.cpp rename to samples/TestCpp/Classes/UserDefaultTest/UserDefaultTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/UserDefaultTest/UserDefaultTest.h b/samples/TestCpp/Classes/UserDefaultTest/UserDefaultTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/UserDefaultTest/UserDefaultTest.h rename to samples/TestCpp/Classes/UserDefaultTest/UserDefaultTest.h diff --git a/samples/Cpp/TestCpp/Classes/VisibleRect.cpp b/samples/TestCpp/Classes/VisibleRect.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/VisibleRect.cpp rename to samples/TestCpp/Classes/VisibleRect.cpp diff --git a/samples/Cpp/TestCpp/Classes/VisibleRect.h b/samples/TestCpp/Classes/VisibleRect.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/VisibleRect.h rename to samples/TestCpp/Classes/VisibleRect.h diff --git a/samples/Cpp/TestCpp/Classes/ZwoptexTest/ZwoptexTest.cpp b/samples/TestCpp/Classes/ZwoptexTest/ZwoptexTest.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/ZwoptexTest/ZwoptexTest.cpp rename to samples/TestCpp/Classes/ZwoptexTest/ZwoptexTest.cpp diff --git a/samples/Cpp/TestCpp/Classes/ZwoptexTest/ZwoptexTest.h b/samples/TestCpp/Classes/ZwoptexTest/ZwoptexTest.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/ZwoptexTest/ZwoptexTest.h rename to samples/TestCpp/Classes/ZwoptexTest/ZwoptexTest.h diff --git a/samples/Cpp/TestCpp/Classes/controller.cpp b/samples/TestCpp/Classes/controller.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/controller.cpp rename to samples/TestCpp/Classes/controller.cpp diff --git a/samples/Cpp/TestCpp/Classes/controller.h b/samples/TestCpp/Classes/controller.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/controller.h rename to samples/TestCpp/Classes/controller.h diff --git a/samples/Cpp/TestCpp/Classes/testBasic.cpp b/samples/TestCpp/Classes/testBasic.cpp similarity index 100% rename from samples/Cpp/TestCpp/Classes/testBasic.cpp rename to samples/TestCpp/Classes/testBasic.cpp diff --git a/samples/Cpp/TestCpp/Classes/testBasic.h b/samples/TestCpp/Classes/testBasic.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/testBasic.h rename to samples/TestCpp/Classes/testBasic.h diff --git a/samples/Cpp/TestCpp/Classes/testResource.h b/samples/TestCpp/Classes/testResource.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/testResource.h rename to samples/TestCpp/Classes/testResource.h diff --git a/samples/Cpp/TestCpp/Classes/tests.h b/samples/TestCpp/Classes/tests.h similarity index 100% rename from samples/Cpp/TestCpp/Classes/tests.h rename to samples/TestCpp/Classes/tests.h diff --git a/samples/Cpp/HelloCpp/Resources/.gitignore b/samples/TestCpp/Resources/.gitignore similarity index 100% rename from samples/Cpp/HelloCpp/Resources/.gitignore rename to samples/TestCpp/Resources/.gitignore diff --git a/samples/Cpp/TestCpp/Resources/Hello.png.REMOVED.git-id b/samples/TestCpp/Resources/Hello.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/Hello.png.REMOVED.git-id rename to samples/TestCpp/Resources/Hello.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/Images/HelloWorld.png.REMOVED.git-id b/samples/TestCpp/Resources/Images/HelloWorld.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/Images/HelloWorld.png.REMOVED.git-id rename to samples/TestCpp/Resources/Images/HelloWorld.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/Images/PlanetCute-1024x1024.png.REMOVED.git-id b/samples/TestCpp/Resources/Images/PlanetCute-1024x1024.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/Images/PlanetCute-1024x1024.png.REMOVED.git-id rename to samples/TestCpp/Resources/Images/PlanetCute-1024x1024.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/Images/atlastest.png.REMOVED.git-id b/samples/TestCpp/Resources/Images/atlastest.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/Images/atlastest.png.REMOVED.git-id rename to samples/TestCpp/Resources/Images/atlastest.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/Images/background1.png.REMOVED.git-id b/samples/TestCpp/Resources/Images/background1.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/Images/background1.png.REMOVED.git-id rename to samples/TestCpp/Resources/Images/background1.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/Images/background2.jpg.REMOVED.git-id b/samples/TestCpp/Resources/Images/background2.jpg.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/Images/background2.jpg.REMOVED.git-id rename to samples/TestCpp/Resources/Images/background2.jpg.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/Images/background2.png.REMOVED.git-id b/samples/TestCpp/Resources/Images/background2.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/Images/background2.png.REMOVED.git-id rename to samples/TestCpp/Resources/Images/background2.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/Images/bugs/bug886.png.REMOVED.git-id b/samples/TestCpp/Resources/Images/bugs/bug886.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/Images/bugs/bug886.png.REMOVED.git-id rename to samples/TestCpp/Resources/Images/bugs/bug886.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/Images/grossini_dance_atlas-mono.png.REMOVED.git-id b/samples/TestCpp/Resources/Images/grossini_dance_atlas-mono.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/Images/grossini_dance_atlas-mono.png.REMOVED.git-id rename to samples/TestCpp/Resources/Images/grossini_dance_atlas-mono.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/Images/landscape-1024x1024.png.REMOVED.git-id b/samples/TestCpp/Resources/Images/landscape-1024x1024.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/Images/landscape-1024x1024.png.REMOVED.git-id rename to samples/TestCpp/Resources/Images/landscape-1024x1024.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/Images/noise.png.REMOVED.git-id b/samples/TestCpp/Resources/Images/noise.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/Images/noise.png.REMOVED.git-id rename to samples/TestCpp/Resources/Images/noise.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/Images/spritesheet1.png.REMOVED.git-id b/samples/TestCpp/Resources/Images/spritesheet1.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/Images/spritesheet1.png.REMOVED.git-id rename to samples/TestCpp/Resources/Images/spritesheet1.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/Images/stone.png.REMOVED.git-id b/samples/TestCpp/Resources/Images/stone.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/Images/stone.png.REMOVED.git-id rename to samples/TestCpp/Resources/Images/stone.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/Images/test_1021x1024.png.REMOVED.git-id b/samples/TestCpp/Resources/Images/test_1021x1024.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/Images/test_1021x1024.png.REMOVED.git-id rename to samples/TestCpp/Resources/Images/test_1021x1024.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/Images/test_1021x1024_a8.pvr.REMOVED.git-id b/samples/TestCpp/Resources/Images/test_1021x1024_a8.pvr.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/Images/test_1021x1024_a8.pvr.REMOVED.git-id rename to samples/TestCpp/Resources/Images/test_1021x1024_a8.pvr.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/Images/test_1021x1024_rgb888.pvr.REMOVED.git-id b/samples/TestCpp/Resources/Images/test_1021x1024_rgb888.pvr.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/Images/test_1021x1024_rgb888.pvr.REMOVED.git-id rename to samples/TestCpp/Resources/Images/test_1021x1024_rgb888.pvr.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/Images/test_1021x1024_rgb888.pvr.gz.REMOVED.git-id b/samples/TestCpp/Resources/Images/test_1021x1024_rgb888.pvr.gz.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/Images/test_1021x1024_rgb888.pvr.gz.REMOVED.git-id rename to samples/TestCpp/Resources/Images/test_1021x1024_rgb888.pvr.gz.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/Images/test_1021x1024_rgba4444.pvr.REMOVED.git-id b/samples/TestCpp/Resources/Images/test_1021x1024_rgba4444.pvr.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/Images/test_1021x1024_rgba4444.pvr.REMOVED.git-id rename to samples/TestCpp/Resources/Images/test_1021x1024_rgba4444.pvr.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/Images/test_1021x1024_rgba4444.pvr.gz.REMOVED.git-id b/samples/TestCpp/Resources/Images/test_1021x1024_rgba4444.pvr.gz.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/Images/test_1021x1024_rgba4444.pvr.gz.REMOVED.git-id rename to samples/TestCpp/Resources/Images/test_1021x1024_rgba4444.pvr.gz.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/Images/test_1021x1024_rgba8888.pvr.REMOVED.git-id b/samples/TestCpp/Resources/Images/test_1021x1024_rgba8888.pvr.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/Images/test_1021x1024_rgba8888.pvr.REMOVED.git-id rename to samples/TestCpp/Resources/Images/test_1021x1024_rgba8888.pvr.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/Images/test_1021x1024_rgba8888.pvr.gz.REMOVED.git-id b/samples/TestCpp/Resources/Images/test_1021x1024_rgba8888.pvr.gz.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/Images/test_1021x1024_rgba8888.pvr.gz.REMOVED.git-id rename to samples/TestCpp/Resources/Images/test_1021x1024_rgba8888.pvr.gz.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/Misc/resources-hd/test4.txt b/samples/TestCpp/Resources/Misc/resources-hd/test4.txt similarity index 100% rename from samples/Cpp/TestCpp/Resources/Misc/resources-hd/test4.txt rename to samples/TestCpp/Resources/Misc/resources-hd/test4.txt diff --git a/samples/Cpp/TestCpp/Resources/Misc/resources-ipad/test2.txt b/samples/TestCpp/Resources/Misc/resources-ipad/test2.txt similarity index 100% rename from samples/Cpp/TestCpp/Resources/Misc/resources-ipad/test2.txt rename to samples/TestCpp/Resources/Misc/resources-ipad/test2.txt diff --git a/samples/Cpp/TestCpp/Resources/Misc/resources-ipadhd/test1.txt b/samples/TestCpp/Resources/Misc/resources-ipadhd/test1.txt similarity index 100% rename from samples/Cpp/TestCpp/Resources/Misc/resources-ipadhd/test1.txt rename to samples/TestCpp/Resources/Misc/resources-ipadhd/test1.txt diff --git a/samples/Cpp/TestCpp/Resources/Misc/resources-iphone/test6.txt b/samples/TestCpp/Resources/Misc/resources-iphone/test6.txt similarity index 100% rename from samples/Cpp/TestCpp/Resources/Misc/resources-iphone/test6.txt rename to samples/TestCpp/Resources/Misc/resources-iphone/test6.txt diff --git a/samples/Cpp/TestCpp/Resources/Misc/resources-mac/test2.txt b/samples/TestCpp/Resources/Misc/resources-mac/test2.txt similarity index 100% rename from samples/Cpp/TestCpp/Resources/Misc/resources-mac/test2.txt rename to samples/TestCpp/Resources/Misc/resources-mac/test2.txt diff --git a/samples/Cpp/TestCpp/Resources/Misc/resources-machd/test1.txt b/samples/TestCpp/Resources/Misc/resources-machd/test1.txt similarity index 100% rename from samples/Cpp/TestCpp/Resources/Misc/resources-machd/test1.txt rename to samples/TestCpp/Resources/Misc/resources-machd/test1.txt diff --git a/samples/Cpp/TestCpp/Resources/Misc/resources-wide/test5.txt b/samples/TestCpp/Resources/Misc/resources-wide/test5.txt similarity index 100% rename from samples/Cpp/TestCpp/Resources/Misc/resources-wide/test5.txt rename to samples/TestCpp/Resources/Misc/resources-wide/test5.txt diff --git a/samples/Cpp/TestCpp/Resources/Misc/resources-widehd/test3.txt b/samples/TestCpp/Resources/Misc/resources-widehd/test3.txt similarity index 100% rename from samples/Cpp/TestCpp/Resources/Misc/resources-widehd/test3.txt rename to samples/TestCpp/Resources/Misc/resources-widehd/test3.txt diff --git a/samples/Cpp/TestCpp/Resources/Misc/searchpath1/file1.txt b/samples/TestCpp/Resources/Misc/searchpath1/file1.txt similarity index 100% rename from samples/Cpp/TestCpp/Resources/Misc/searchpath1/file1.txt rename to samples/TestCpp/Resources/Misc/searchpath1/file1.txt diff --git a/samples/Cpp/TestCpp/Resources/Misc/searchpath2/resources-ipad/file2.txt b/samples/TestCpp/Resources/Misc/searchpath2/resources-ipad/file2.txt similarity index 100% rename from samples/Cpp/TestCpp/Resources/Misc/searchpath2/resources-ipad/file2.txt rename to samples/TestCpp/Resources/Misc/searchpath2/resources-ipad/file2.txt diff --git a/samples/Cpp/TestCpp/Resources/Shaders/example_ColorBars.vsh b/samples/TestCpp/Resources/Shaders/example_ColorBars.vsh similarity index 100% rename from samples/Cpp/TestCpp/Resources/Shaders/example_ColorBars.vsh rename to samples/TestCpp/Resources/Shaders/example_ColorBars.vsh diff --git a/samples/Cpp/TestCpp/Resources/Shaders/example_Flower.vsh b/samples/TestCpp/Resources/Shaders/example_Flower.vsh similarity index 100% rename from samples/Cpp/TestCpp/Resources/Shaders/example_Flower.vsh rename to samples/TestCpp/Resources/Shaders/example_Flower.vsh diff --git a/samples/Cpp/TestCpp/Resources/Shaders/example_Heart.vsh b/samples/TestCpp/Resources/Shaders/example_Heart.vsh similarity index 100% rename from samples/Cpp/TestCpp/Resources/Shaders/example_Heart.vsh rename to samples/TestCpp/Resources/Shaders/example_Heart.vsh diff --git a/samples/Cpp/TestCpp/Resources/Shaders/example_Julia.vsh b/samples/TestCpp/Resources/Shaders/example_Julia.vsh similarity index 100% rename from samples/Cpp/TestCpp/Resources/Shaders/example_Julia.vsh rename to samples/TestCpp/Resources/Shaders/example_Julia.vsh diff --git a/samples/Cpp/TestCpp/Resources/Shaders/example_Mandelbrot.vsh b/samples/TestCpp/Resources/Shaders/example_Mandelbrot.vsh similarity index 100% rename from samples/Cpp/TestCpp/Resources/Shaders/example_Mandelbrot.vsh rename to samples/TestCpp/Resources/Shaders/example_Mandelbrot.vsh diff --git a/samples/Cpp/TestCpp/Resources/Shaders/example_Monjori.vsh b/samples/TestCpp/Resources/Shaders/example_Monjori.vsh similarity index 100% rename from samples/Cpp/TestCpp/Resources/Shaders/example_Monjori.vsh rename to samples/TestCpp/Resources/Shaders/example_Monjori.vsh diff --git a/samples/Cpp/TestCpp/Resources/Shaders/example_Plasma.vsh b/samples/TestCpp/Resources/Shaders/example_Plasma.vsh similarity index 100% rename from samples/Cpp/TestCpp/Resources/Shaders/example_Plasma.vsh rename to samples/TestCpp/Resources/Shaders/example_Plasma.vsh diff --git a/samples/Cpp/TestCpp/Resources/Shaders/example_Twist.vsh b/samples/TestCpp/Resources/Shaders/example_Twist.vsh similarity index 100% rename from samples/Cpp/TestCpp/Resources/Shaders/example_Twist.vsh rename to samples/TestCpp/Resources/Shaders/example_Twist.vsh diff --git a/samples/Cpp/TestCpp/Resources/TileMaps/hexa-tiles.png.REMOVED.git-id b/samples/TestCpp/Resources/TileMaps/hexa-tiles.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/TileMaps/hexa-tiles.png.REMOVED.git-id rename to samples/TestCpp/Resources/TileMaps/hexa-tiles.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/TileMaps/map/slcj.png.REMOVED.git-id b/samples/TestCpp/Resources/TileMaps/map/slcj.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/TileMaps/map/slcj.png.REMOVED.git-id rename to samples/TestCpp/Resources/TileMaps/map/slcj.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/TileMaps/ortho-test1.png.REMOVED.git-id b/samples/TestCpp/Resources/TileMaps/ortho-test1.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/TileMaps/ortho-test1.png.REMOVED.git-id rename to samples/TestCpp/Resources/TileMaps/ortho-test1.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/TileMaps/ortho-test1_bw.png.REMOVED.git-id b/samples/TestCpp/Resources/TileMaps/ortho-test1_bw.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/TileMaps/ortho-test1_bw.png.REMOVED.git-id rename to samples/TestCpp/Resources/TileMaps/ortho-test1_bw.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/animations/grossini.plist.xml b/samples/TestCpp/Resources/animations/grossini.plist.xml similarity index 100% rename from samples/Cpp/TestCpp/Resources/animations/grossini.plist.xml rename to samples/TestCpp/Resources/animations/grossini.plist.xml diff --git a/samples/Cpp/TestCpp/Resources/armature/Cowboy.ExportJson.REMOVED.git-id b/samples/TestCpp/Resources/armature/Cowboy.ExportJson.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/armature/Cowboy.ExportJson.REMOVED.git-id rename to samples/TestCpp/Resources/armature/Cowboy.ExportJson.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/armature/Cowboy0.png.REMOVED.git-id b/samples/TestCpp/Resources/armature/Cowboy0.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/armature/Cowboy0.png.REMOVED.git-id rename to samples/TestCpp/Resources/armature/Cowboy0.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/armature/Dragon.xml b/samples/TestCpp/Resources/armature/Dragon.xml similarity index 100% rename from samples/Cpp/TestCpp/Resources/armature/Dragon.xml rename to samples/TestCpp/Resources/armature/Dragon.xml diff --git a/samples/Cpp/TestCpp/Resources/armature/HeroAnimation.ExportJson.REMOVED.git-id b/samples/TestCpp/Resources/armature/HeroAnimation.ExportJson.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/armature/HeroAnimation.ExportJson.REMOVED.git-id rename to samples/TestCpp/Resources/armature/HeroAnimation.ExportJson.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/armature/cyborg.xml b/samples/TestCpp/Resources/armature/cyborg.xml similarity index 100% rename from samples/Cpp/TestCpp/Resources/armature/cyborg.xml rename to samples/TestCpp/Resources/armature/cyborg.xml diff --git a/samples/Cpp/TestCpp/Resources/armature/knight.xml b/samples/TestCpp/Resources/armature/knight.xml similarity index 100% rename from samples/Cpp/TestCpp/Resources/armature/knight.xml rename to samples/TestCpp/Resources/armature/knight.xml diff --git a/samples/Cpp/TestCpp/Resources/armature/robot.xml b/samples/TestCpp/Resources/armature/robot.xml similarity index 100% rename from samples/Cpp/TestCpp/Resources/armature/robot.xml rename to samples/TestCpp/Resources/armature/robot.xml diff --git a/samples/Cpp/TestCpp/Resources/armature/weapon.xml b/samples/TestCpp/Resources/armature/weapon.xml similarity index 100% rename from samples/Cpp/TestCpp/Resources/armature/weapon.xml rename to samples/TestCpp/Resources/armature/weapon.xml diff --git a/samples/Cpp/SimpleGame/Resources/background-music-aac.wav.REMOVED.git-id b/samples/TestCpp/Resources/background-music-aac.wav.REMOVED.git-id similarity index 100% rename from samples/Cpp/SimpleGame/Resources/background-music-aac.wav.REMOVED.git-id rename to samples/TestCpp/Resources/background-music-aac.wav.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/background.mp3.REMOVED.git-id b/samples/TestCpp/Resources/background.mp3.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/background.mp3.REMOVED.git-id rename to samples/TestCpp/Resources/background.mp3.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/ccb/flower.jpg.REMOVED.git-id b/samples/TestCpp/Resources/ccb/flower.jpg.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/ccb/flower.jpg.REMOVED.git-id rename to samples/TestCpp/Resources/ccb/flower.jpg.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/ccb/gem-0.wav.REMOVED.git-id b/samples/TestCpp/Resources/ccb/gem-0.wav.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/ccb/gem-0.wav.REMOVED.git-id rename to samples/TestCpp/Resources/ccb/gem-0.wav.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/ccb/gem-1.wav.REMOVED.git-id b/samples/TestCpp/Resources/ccb/gem-1.wav.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/ccb/gem-1.wav.REMOVED.git-id rename to samples/TestCpp/Resources/ccb/gem-1.wav.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/ccb/markerfelt24shadow.fnt.REMOVED.git-id b/samples/TestCpp/Resources/ccb/markerfelt24shadow.fnt.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/ccb/markerfelt24shadow.fnt.REMOVED.git-id rename to samples/TestCpp/Resources/ccb/markerfelt24shadow.fnt.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/cocosgui/Hello.png.REMOVED.git-id b/samples/TestCpp/Resources/cocosgui/Hello.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/cocosgui/Hello.png.REMOVED.git-id rename to samples/TestCpp/Resources/cocosgui/Hello.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/cocosgui/UITest/background.png.REMOVED.git-id b/samples/TestCpp/Resources/cocosgui/UITest/background.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/cocosgui/UITest/background.png.REMOVED.git-id rename to samples/TestCpp/Resources/cocosgui/UITest/background.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/cocosgui/b11.png.REMOVED.git-id b/samples/TestCpp/Resources/cocosgui/b11.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/cocosgui/b11.png.REMOVED.git-id rename to samples/TestCpp/Resources/cocosgui/b11.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/cocosgui/bitmapFontTest2.png.REMOVED.git-id b/samples/TestCpp/Resources/cocosgui/bitmapFontTest2.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/cocosgui/bitmapFontTest2.png.REMOVED.git-id rename to samples/TestCpp/Resources/cocosgui/bitmapFontTest2.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/cocosgui/examples/examples.json.REMOVED.git-id b/samples/TestCpp/Resources/cocosgui/examples/examples.json.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/cocosgui/examples/examples.json.REMOVED.git-id rename to samples/TestCpp/Resources/cocosgui/examples/examples.json.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/cocosgui/gui_examples/map_1/map_pve.png.REMOVED.git-id b/samples/TestCpp/Resources/cocosgui/gui_examples/map_1/map_pve.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/cocosgui/gui_examples/map_1/map_pve.png.REMOVED.git-id rename to samples/TestCpp/Resources/cocosgui/gui_examples/map_1/map_pve.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/cocosgui/gui_examples/page_1/background.png.REMOVED.git-id b/samples/TestCpp/Resources/cocosgui/gui_examples/page_1/background.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/cocosgui/gui_examples/page_1/background.png.REMOVED.git-id rename to samples/TestCpp/Resources/cocosgui/gui_examples/page_1/background.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/extensions/background.png.REMOVED.git-id b/samples/TestCpp/Resources/extensions/background.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/extensions/background.png.REMOVED.git-id rename to samples/TestCpp/Resources/extensions/background.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/fonts/Courier New.ttf.REMOVED.git-id b/samples/TestCpp/Resources/fonts/Courier New.ttf.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/fonts/Courier New.ttf.REMOVED.git-id rename to samples/TestCpp/Resources/fonts/Courier New.ttf.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/fonts/Thonburi.ttf.REMOVED.git-id b/samples/TestCpp/Resources/fonts/Thonburi.ttf.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/fonts/Thonburi.ttf.REMOVED.git-id rename to samples/TestCpp/Resources/fonts/Thonburi.ttf.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/fonts/ThonburiBold.ttf.REMOVED.git-id b/samples/TestCpp/Resources/fonts/ThonburiBold.ttf.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/fonts/ThonburiBold.ttf.REMOVED.git-id rename to samples/TestCpp/Resources/fonts/ThonburiBold.ttf.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/fonts/arial-26-en-ru_0.png.REMOVED.git-id b/samples/TestCpp/Resources/fonts/arial-26-en-ru_0.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/fonts/arial-26-en-ru_0.png.REMOVED.git-id rename to samples/TestCpp/Resources/fonts/arial-26-en-ru_0.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/fonts/arial-unicode-26.GlyphProject b/samples/TestCpp/Resources/fonts/arial-unicode-26.GlyphProject similarity index 100% rename from samples/Cpp/TestCpp/Resources/fonts/arial-unicode-26.GlyphProject rename to samples/TestCpp/Resources/fonts/arial-unicode-26.GlyphProject diff --git a/samples/Cpp/TestCpp/Resources/fonts/arial-unicode-26.png.REMOVED.git-id b/samples/TestCpp/Resources/fonts/arial-unicode-26.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/fonts/arial-unicode-26.png.REMOVED.git-id rename to samples/TestCpp/Resources/fonts/arial-unicode-26.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/fonts/arial.ttf.REMOVED.git-id b/samples/TestCpp/Resources/fonts/arial.ttf.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/fonts/arial.ttf.REMOVED.git-id rename to samples/TestCpp/Resources/fonts/arial.ttf.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/fonts/bitmapFontChinese.png.REMOVED.git-id b/samples/TestCpp/Resources/fonts/bitmapFontChinese.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/fonts/bitmapFontChinese.png.REMOVED.git-id rename to samples/TestCpp/Resources/fonts/bitmapFontChinese.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/fonts/bitmapFontTest.png.REMOVED.git-id b/samples/TestCpp/Resources/fonts/bitmapFontTest.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/fonts/bitmapFontTest.png.REMOVED.git-id rename to samples/TestCpp/Resources/fonts/bitmapFontTest.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/fonts/bitmapFontTest2.bmp.REMOVED.git-id b/samples/TestCpp/Resources/fonts/bitmapFontTest2.bmp.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/fonts/bitmapFontTest2.bmp.REMOVED.git-id rename to samples/TestCpp/Resources/fonts/bitmapFontTest2.bmp.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/fonts/bitmapFontTest2.png.REMOVED.git-id b/samples/TestCpp/Resources/fonts/bitmapFontTest2.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/fonts/bitmapFontTest2.png.REMOVED.git-id rename to samples/TestCpp/Resources/fonts/bitmapFontTest2.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/fonts/boundsTestFont.png.REMOVED.git-id b/samples/TestCpp/Resources/fonts/boundsTestFont.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/fonts/boundsTestFont.png.REMOVED.git-id rename to samples/TestCpp/Resources/fonts/boundsTestFont.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/fonts/font-issue1343-hd.png.REMOVED.git-id b/samples/TestCpp/Resources/fonts/font-issue1343-hd.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/fonts/font-issue1343-hd.png.REMOVED.git-id rename to samples/TestCpp/Resources/fonts/font-issue1343-hd.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/fonts/futura-48.png.REMOVED.git-id b/samples/TestCpp/Resources/fonts/futura-48.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/fonts/futura-48.png.REMOVED.git-id rename to samples/TestCpp/Resources/fonts/futura-48.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/fonts/helvetica-geneva-32.png.REMOVED.git-id b/samples/TestCpp/Resources/fonts/helvetica-geneva-32.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/fonts/helvetica-geneva-32.png.REMOVED.git-id rename to samples/TestCpp/Resources/fonts/helvetica-geneva-32.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/fonts/markerFelt.fnt.REMOVED.git-id b/samples/TestCpp/Resources/fonts/markerFelt.fnt.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/fonts/markerFelt.fnt.REMOVED.git-id rename to samples/TestCpp/Resources/fonts/markerFelt.fnt.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/fonts/strings.xml b/samples/TestCpp/Resources/fonts/strings.xml similarity index 100% rename from samples/Cpp/TestCpp/Resources/fonts/strings.xml rename to samples/TestCpp/Resources/fonts/strings.xml diff --git a/samples/Cpp/TestCpp/Resources/fonts/tahoma.ttf.REMOVED.git-id b/samples/TestCpp/Resources/fonts/tahoma.ttf.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/fonts/tahoma.ttf.REMOVED.git-id rename to samples/TestCpp/Resources/fonts/tahoma.ttf.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/fonts/wt021.ttf.REMOVED.git-id b/samples/TestCpp/Resources/fonts/wt021.ttf.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/fonts/wt021.ttf.REMOVED.git-id rename to samples/TestCpp/Resources/fonts/wt021.ttf.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/hd/Images/background1.png.REMOVED.git-id b/samples/TestCpp/Resources/hd/Images/background1.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/hd/Images/background1.png.REMOVED.git-id rename to samples/TestCpp/Resources/hd/Images/background1.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/hd/Images/background2.jpg.REMOVED.git-id b/samples/TestCpp/Resources/hd/Images/background2.jpg.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/hd/Images/background2.jpg.REMOVED.git-id rename to samples/TestCpp/Resources/hd/Images/background2.jpg.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/hd/Images/background2.png.REMOVED.git-id b/samples/TestCpp/Resources/hd/Images/background2.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/hd/Images/background2.png.REMOVED.git-id rename to samples/TestCpp/Resources/hd/Images/background2.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/hd/armature/Cowboy0.png.REMOVED.git-id b/samples/TestCpp/Resources/hd/armature/Cowboy0.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/hd/armature/Cowboy0.png.REMOVED.git-id rename to samples/TestCpp/Resources/hd/armature/Cowboy0.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/hd/armature/Dragon.png.REMOVED.git-id b/samples/TestCpp/Resources/hd/armature/Dragon.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/hd/armature/Dragon.png.REMOVED.git-id rename to samples/TestCpp/Resources/hd/armature/Dragon.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/hd/armature/HeroAnimation0.png.REMOVED.git-id b/samples/TestCpp/Resources/hd/armature/HeroAnimation0.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/hd/armature/HeroAnimation0.png.REMOVED.git-id rename to samples/TestCpp/Resources/hd/armature/HeroAnimation0.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/hd/armature/weapon.png.REMOVED.git-id b/samples/TestCpp/Resources/hd/armature/weapon.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/hd/armature/weapon.png.REMOVED.git-id rename to samples/TestCpp/Resources/hd/armature/weapon.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/hd/ccb/burst.png.REMOVED.git-id b/samples/TestCpp/Resources/hd/ccb/burst.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/hd/ccb/burst.png.REMOVED.git-id rename to samples/TestCpp/Resources/hd/ccb/burst.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/hd/cocosgui/Hello.png.REMOVED.git-id b/samples/TestCpp/Resources/hd/cocosgui/Hello.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/hd/cocosgui/Hello.png.REMOVED.git-id rename to samples/TestCpp/Resources/hd/cocosgui/Hello.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/hd/cocosgui/UITest/background.png.REMOVED.git-id b/samples/TestCpp/Resources/hd/cocosgui/UITest/background.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/hd/cocosgui/UITest/background.png.REMOVED.git-id rename to samples/TestCpp/Resources/hd/cocosgui/UITest/background.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/hd/cocosgui/b11.png.REMOVED.git-id b/samples/TestCpp/Resources/hd/cocosgui/b11.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/hd/cocosgui/b11.png.REMOVED.git-id rename to samples/TestCpp/Resources/hd/cocosgui/b11.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/hd/cocosgui/bitmapFontTest2.png.REMOVED.git-id b/samples/TestCpp/Resources/hd/cocosgui/bitmapFontTest2.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/hd/cocosgui/bitmapFontTest2.png.REMOVED.git-id rename to samples/TestCpp/Resources/hd/cocosgui/bitmapFontTest2.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/hd/cocosgui/examples/examples.json.REMOVED.git-id b/samples/TestCpp/Resources/hd/cocosgui/examples/examples.json.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/hd/cocosgui/examples/examples.json.REMOVED.git-id rename to samples/TestCpp/Resources/hd/cocosgui/examples/examples.json.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/hd/cocosgui/gui_examples/map_1/map_pve.png.REMOVED.git-id b/samples/TestCpp/Resources/hd/cocosgui/gui_examples/map_1/map_pve.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/hd/cocosgui/gui_examples/map_1/map_pve.png.REMOVED.git-id rename to samples/TestCpp/Resources/hd/cocosgui/gui_examples/map_1/map_pve.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/hd/cocosgui/gui_examples/page_1/background.png.REMOVED.git-id b/samples/TestCpp/Resources/hd/cocosgui/gui_examples/page_1/background.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/hd/cocosgui/gui_examples/page_1/background.png.REMOVED.git-id rename to samples/TestCpp/Resources/hd/cocosgui/gui_examples/page_1/background.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/hd/extensions/background.png.REMOVED.git-id b/samples/TestCpp/Resources/hd/extensions/background.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/hd/extensions/background.png.REMOVED.git-id rename to samples/TestCpp/Resources/hd/extensions/background.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/hd/fonts/font-issue1343.png.REMOVED.git-id b/samples/TestCpp/Resources/hd/fonts/font-issue1343.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/hd/fonts/font-issue1343.png.REMOVED.git-id rename to samples/TestCpp/Resources/hd/fonts/font-issue1343.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/hd/fonts/markerFelt.fnt.REMOVED.git-id b/samples/TestCpp/Resources/hd/fonts/markerFelt.fnt.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/hd/fonts/markerFelt.fnt.REMOVED.git-id rename to samples/TestCpp/Resources/hd/fonts/markerFelt.fnt.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/hd/fonts/markerFelt.png.REMOVED.git-id b/samples/TestCpp/Resources/hd/fonts/markerFelt.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/hd/fonts/markerFelt.png.REMOVED.git-id rename to samples/TestCpp/Resources/hd/fonts/markerFelt.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/hd/fonts/tuffy_bold_italic-charmap.png.REMOVED.git-id b/samples/TestCpp/Resources/hd/fonts/tuffy_bold_italic-charmap.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/hd/fonts/tuffy_bold_italic-charmap.png.REMOVED.git-id rename to samples/TestCpp/Resources/hd/fonts/tuffy_bold_italic-charmap.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/hd/scenetest/ArmatureComponentTest/Images/startMenuBG.png.REMOVED.git-id b/samples/TestCpp/Resources/hd/scenetest/ArmatureComponentTest/Images/startMenuBG.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/hd/scenetest/ArmatureComponentTest/Images/startMenuBG.png.REMOVED.git-id rename to samples/TestCpp/Resources/hd/scenetest/ArmatureComponentTest/Images/startMenuBG.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/hd/scenetest/ArmatureComponentTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id b/samples/TestCpp/Resources/hd/scenetest/ArmatureComponentTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/hd/scenetest/ArmatureComponentTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id rename to samples/TestCpp/Resources/hd/scenetest/ArmatureComponentTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/hd/scenetest/ArmatureComponentTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id b/samples/TestCpp/Resources/hd/scenetest/ArmatureComponentTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/hd/scenetest/ArmatureComponentTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id rename to samples/TestCpp/Resources/hd/scenetest/ArmatureComponentTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/hd/scenetest/BackgroundComponentTest/Images/startMenuBG.png.REMOVED.git-id b/samples/TestCpp/Resources/hd/scenetest/BackgroundComponentTest/Images/startMenuBG.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/hd/scenetest/BackgroundComponentTest/Images/startMenuBG.png.REMOVED.git-id rename to samples/TestCpp/Resources/hd/scenetest/BackgroundComponentTest/Images/startMenuBG.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/hd/scenetest/BackgroundComponentTest/Misc/music_logo.mp3.REMOVED.git-id b/samples/TestCpp/Resources/hd/scenetest/BackgroundComponentTest/Misc/music_logo.mp3.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/hd/scenetest/BackgroundComponentTest/Misc/music_logo.mp3.REMOVED.git-id rename to samples/TestCpp/Resources/hd/scenetest/BackgroundComponentTest/Misc/music_logo.mp3.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/hd/scenetest/BackgroundComponentTest/Misc/music_logo.wav.REMOVED.git-id b/samples/TestCpp/Resources/hd/scenetest/BackgroundComponentTest/Misc/music_logo.wav.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/hd/scenetest/BackgroundComponentTest/Misc/music_logo.wav.REMOVED.git-id rename to samples/TestCpp/Resources/hd/scenetest/BackgroundComponentTest/Misc/music_logo.wav.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/hd/scenetest/BackgroundComponentTest/startMenu/Fish_UI/starMenuButton01.png.REMOVED.git-id b/samples/TestCpp/Resources/hd/scenetest/BackgroundComponentTest/startMenu/Fish_UI/starMenuButton01.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/hd/scenetest/BackgroundComponentTest/startMenu/Fish_UI/starMenuButton01.png.REMOVED.git-id rename to samples/TestCpp/Resources/hd/scenetest/BackgroundComponentTest/startMenu/Fish_UI/starMenuButton01.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/hd/scenetest/BackgroundComponentTest/startMenu/Fish_UI/starMenuButton02.png.REMOVED.git-id b/samples/TestCpp/Resources/hd/scenetest/BackgroundComponentTest/startMenu/Fish_UI/starMenuButton02.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/hd/scenetest/BackgroundComponentTest/startMenu/Fish_UI/starMenuButton02.png.REMOVED.git-id rename to samples/TestCpp/Resources/hd/scenetest/BackgroundComponentTest/startMenu/Fish_UI/starMenuButton02.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/hd/scenetest/BackgroundComponentTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id b/samples/TestCpp/Resources/hd/scenetest/BackgroundComponentTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/hd/scenetest/BackgroundComponentTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id rename to samples/TestCpp/Resources/hd/scenetest/BackgroundComponentTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/hd/scenetest/EffectComponentTest/CowBoy/Cowboy.ExportJson.REMOVED.git-id b/samples/TestCpp/Resources/hd/scenetest/EffectComponentTest/CowBoy/Cowboy.ExportJson.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/hd/scenetest/EffectComponentTest/CowBoy/Cowboy.ExportJson.REMOVED.git-id rename to samples/TestCpp/Resources/hd/scenetest/EffectComponentTest/CowBoy/Cowboy.ExportJson.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/hd/scenetest/EffectComponentTest/CowBoy/Cowboy0.png.REMOVED.git-id b/samples/TestCpp/Resources/hd/scenetest/EffectComponentTest/CowBoy/Cowboy0.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/hd/scenetest/EffectComponentTest/CowBoy/Cowboy0.png.REMOVED.git-id rename to samples/TestCpp/Resources/hd/scenetest/EffectComponentTest/CowBoy/Cowboy0.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/Images/startMenuBG.png.REMOVED.git-id b/samples/TestCpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/Images/startMenuBG.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/Images/startMenuBG.png.REMOVED.git-id rename to samples/TestCpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/Images/startMenuBG.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.mp3.REMOVED.git-id b/samples/TestCpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.mp3.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.mp3.REMOVED.git-id rename to samples/TestCpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.mp3.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.wav.REMOVED.git-id b/samples/TestCpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.wav.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.wav.REMOVED.git-id rename to samples/TestCpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.wav.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id b/samples/TestCpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id rename to samples/TestCpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id b/samples/TestCpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id rename to samples/TestCpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/starMenuButton01.png.REMOVED.git-id b/samples/TestCpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/starMenuButton01.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/starMenuButton01.png.REMOVED.git-id rename to samples/TestCpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/starMenuButton01.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/starMenuButton02.png.REMOVED.git-id b/samples/TestCpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/starMenuButton02.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/starMenuButton02.png.REMOVED.git-id rename to samples/TestCpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/starMenuButton02.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id b/samples/TestCpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id rename to samples/TestCpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/hd/scenetest/TriggerTest/Images/startMenuBG.png.REMOVED.git-id b/samples/TestCpp/Resources/hd/scenetest/TriggerTest/Images/startMenuBG.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/hd/scenetest/TriggerTest/Images/startMenuBG.png.REMOVED.git-id rename to samples/TestCpp/Resources/hd/scenetest/TriggerTest/Images/startMenuBG.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/hd/scenetest/TriggerTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id b/samples/TestCpp/Resources/hd/scenetest/TriggerTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/hd/scenetest/TriggerTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id rename to samples/TestCpp/Resources/hd/scenetest/TriggerTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/hd/scenetest/TriggerTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id b/samples/TestCpp/Resources/hd/scenetest/TriggerTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/hd/scenetest/TriggerTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id rename to samples/TestCpp/Resources/hd/scenetest/TriggerTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/hd/scenetest/UIComponentTest/Images/startMenuBG.png.REMOVED.git-id b/samples/TestCpp/Resources/hd/scenetest/UIComponentTest/Images/startMenuBG.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/hd/scenetest/UIComponentTest/Images/startMenuBG.png.REMOVED.git-id rename to samples/TestCpp/Resources/hd/scenetest/UIComponentTest/Images/startMenuBG.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/hd/scenetest/UIComponentTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id b/samples/TestCpp/Resources/hd/scenetest/UIComponentTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/hd/scenetest/UIComponentTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id rename to samples/TestCpp/Resources/hd/scenetest/UIComponentTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/hd/scenetest/UIComponentTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id b/samples/TestCpp/Resources/hd/scenetest/UIComponentTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/hd/scenetest/UIComponentTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id rename to samples/TestCpp/Resources/hd/scenetest/UIComponentTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/hd/spine/goblins.png.REMOVED.git-id b/samples/TestCpp/Resources/hd/spine/goblins.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/hd/spine/goblins.png.REMOVED.git-id rename to samples/TestCpp/Resources/hd/spine/goblins.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/hd/spine/spineboy.png.REMOVED.git-id b/samples/TestCpp/Resources/hd/spine/spineboy.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/hd/spine/spineboy.png.REMOVED.git-id rename to samples/TestCpp/Resources/hd/spine/spineboy.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/ipad/ccb/burst.png.REMOVED.git-id b/samples/TestCpp/Resources/ipad/ccb/burst.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/ipad/ccb/burst.png.REMOVED.git-id rename to samples/TestCpp/Resources/ipad/ccb/burst.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/ipad/extensions/background.png.REMOVED.git-id b/samples/TestCpp/Resources/ipad/extensions/background.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/ipad/extensions/background.png.REMOVED.git-id rename to samples/TestCpp/Resources/ipad/extensions/background.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/scenetest/ArmatureComponentTest/Images/startMenuBG.png.REMOVED.git-id b/samples/TestCpp/Resources/scenetest/ArmatureComponentTest/Images/startMenuBG.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/scenetest/ArmatureComponentTest/Images/startMenuBG.png.REMOVED.git-id rename to samples/TestCpp/Resources/scenetest/ArmatureComponentTest/Images/startMenuBG.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/scenetest/ArmatureComponentTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id b/samples/TestCpp/Resources/scenetest/ArmatureComponentTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/scenetest/ArmatureComponentTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id rename to samples/TestCpp/Resources/scenetest/ArmatureComponentTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/scenetest/ArmatureComponentTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id b/samples/TestCpp/Resources/scenetest/ArmatureComponentTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/scenetest/ArmatureComponentTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id rename to samples/TestCpp/Resources/scenetest/ArmatureComponentTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/scenetest/BackgroundComponentTest/Images/startMenuBG.png.REMOVED.git-id b/samples/TestCpp/Resources/scenetest/BackgroundComponentTest/Images/startMenuBG.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/scenetest/BackgroundComponentTest/Images/startMenuBG.png.REMOVED.git-id rename to samples/TestCpp/Resources/scenetest/BackgroundComponentTest/Images/startMenuBG.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/scenetest/BackgroundComponentTest/Misc/music_logo.mp3.REMOVED.git-id b/samples/TestCpp/Resources/scenetest/BackgroundComponentTest/Misc/music_logo.mp3.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/scenetest/BackgroundComponentTest/Misc/music_logo.mp3.REMOVED.git-id rename to samples/TestCpp/Resources/scenetest/BackgroundComponentTest/Misc/music_logo.mp3.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/scenetest/BackgroundComponentTest/Misc/music_logo.wav.REMOVED.git-id b/samples/TestCpp/Resources/scenetest/BackgroundComponentTest/Misc/music_logo.wav.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/scenetest/BackgroundComponentTest/Misc/music_logo.wav.REMOVED.git-id rename to samples/TestCpp/Resources/scenetest/BackgroundComponentTest/Misc/music_logo.wav.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/scenetest/BackgroundComponentTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id b/samples/TestCpp/Resources/scenetest/BackgroundComponentTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/scenetest/BackgroundComponentTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id rename to samples/TestCpp/Resources/scenetest/BackgroundComponentTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/scenetest/EffectComponentTest/CowBoy/Cowboy.ExportJson.REMOVED.git-id b/samples/TestCpp/Resources/scenetest/EffectComponentTest/CowBoy/Cowboy.ExportJson.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/scenetest/EffectComponentTest/CowBoy/Cowboy.ExportJson.REMOVED.git-id rename to samples/TestCpp/Resources/scenetest/EffectComponentTest/CowBoy/Cowboy.ExportJson.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/scenetest/EffectComponentTest/CowBoy/Cowboy0.png.REMOVED.git-id b/samples/TestCpp/Resources/scenetest/EffectComponentTest/CowBoy/Cowboy0.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/scenetest/EffectComponentTest/CowBoy/Cowboy0.png.REMOVED.git-id rename to samples/TestCpp/Resources/scenetest/EffectComponentTest/CowBoy/Cowboy0.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/scenetest/LoadSceneEdtiorFileTest/Images/startMenuBG.png.REMOVED.git-id b/samples/TestCpp/Resources/scenetest/LoadSceneEdtiorFileTest/Images/startMenuBG.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/scenetest/LoadSceneEdtiorFileTest/Images/startMenuBG.png.REMOVED.git-id rename to samples/TestCpp/Resources/scenetest/LoadSceneEdtiorFileTest/Images/startMenuBG.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.mp3.REMOVED.git-id b/samples/TestCpp/Resources/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.mp3.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.mp3.REMOVED.git-id rename to samples/TestCpp/Resources/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.mp3.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.wav.REMOVED.git-id b/samples/TestCpp/Resources/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.wav.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.wav.REMOVED.git-id rename to samples/TestCpp/Resources/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.wav.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/scenetest/LoadSceneEdtiorFileTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id b/samples/TestCpp/Resources/scenetest/LoadSceneEdtiorFileTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/scenetest/LoadSceneEdtiorFileTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id rename to samples/TestCpp/Resources/scenetest/LoadSceneEdtiorFileTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/scenetest/LoadSceneEdtiorFileTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id b/samples/TestCpp/Resources/scenetest/LoadSceneEdtiorFileTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/scenetest/LoadSceneEdtiorFileTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id rename to samples/TestCpp/Resources/scenetest/LoadSceneEdtiorFileTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id b/samples/TestCpp/Resources/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id rename to samples/TestCpp/Resources/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/scenetest/TriggerTest/Images/startMenuBG.png.REMOVED.git-id b/samples/TestCpp/Resources/scenetest/TriggerTest/Images/startMenuBG.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/scenetest/TriggerTest/Images/startMenuBG.png.REMOVED.git-id rename to samples/TestCpp/Resources/scenetest/TriggerTest/Images/startMenuBG.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/scenetest/TriggerTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id b/samples/TestCpp/Resources/scenetest/TriggerTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/scenetest/TriggerTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id rename to samples/TestCpp/Resources/scenetest/TriggerTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/scenetest/TriggerTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id b/samples/TestCpp/Resources/scenetest/TriggerTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/scenetest/TriggerTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id rename to samples/TestCpp/Resources/scenetest/TriggerTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/scenetest/UIComponentTest/Images/startMenuBG.png.REMOVED.git-id b/samples/TestCpp/Resources/scenetest/UIComponentTest/Images/startMenuBG.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/scenetest/UIComponentTest/Images/startMenuBG.png.REMOVED.git-id rename to samples/TestCpp/Resources/scenetest/UIComponentTest/Images/startMenuBG.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/scenetest/UIComponentTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id b/samples/TestCpp/Resources/scenetest/UIComponentTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/scenetest/UIComponentTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id rename to samples/TestCpp/Resources/scenetest/UIComponentTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/scenetest/UIComponentTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id b/samples/TestCpp/Resources/scenetest/UIComponentTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/scenetest/UIComponentTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id rename to samples/TestCpp/Resources/scenetest/UIComponentTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/spine/goblins.png.REMOVED.git-id b/samples/TestCpp/Resources/spine/goblins.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/spine/goblins.png.REMOVED.git-id rename to samples/TestCpp/Resources/spine/goblins.png.REMOVED.git-id diff --git a/samples/Cpp/HelloCpp/proj.android/.classpath b/samples/TestCpp/proj.android/.classpath similarity index 100% rename from samples/Cpp/HelloCpp/proj.android/.classpath rename to samples/TestCpp/proj.android/.classpath diff --git a/samples/Cpp/TestCpp/proj.android/.externalToolBuilders/Javah_jni_builder.launch b/samples/TestCpp/proj.android/.externalToolBuilders/Javah_jni_builder.launch similarity index 100% rename from samples/Cpp/TestCpp/proj.android/.externalToolBuilders/Javah_jni_builder.launch rename to samples/TestCpp/proj.android/.externalToolBuilders/Javah_jni_builder.launch diff --git a/samples/Cpp/TestCpp/proj.android/.project b/samples/TestCpp/proj.android/.project similarity index 100% rename from samples/Cpp/TestCpp/proj.android/.project rename to samples/TestCpp/proj.android/.project diff --git a/samples/Cpp/AssetsManagerTest/proj.android/.settings/org.eclipse.cdt.codan.core.prefs b/samples/TestCpp/proj.android/.settings/org.eclipse.cdt.codan.core.prefs similarity index 100% rename from samples/Cpp/AssetsManagerTest/proj.android/.settings/org.eclipse.cdt.codan.core.prefs rename to samples/TestCpp/proj.android/.settings/org.eclipse.cdt.codan.core.prefs diff --git a/samples/Cpp/TestCpp/proj.android/AndroidManifest.xml b/samples/TestCpp/proj.android/AndroidManifest.xml similarity index 100% rename from samples/Cpp/TestCpp/proj.android/AndroidManifest.xml rename to samples/TestCpp/proj.android/AndroidManifest.xml diff --git a/samples/Cpp/AssetsManagerTest/proj.android/README.md b/samples/TestCpp/proj.android/README.md similarity index 100% rename from samples/Cpp/AssetsManagerTest/proj.android/README.md rename to samples/TestCpp/proj.android/README.md diff --git a/samples/Cpp/AssetsManagerTest/proj.android/ant.properties b/samples/TestCpp/proj.android/ant.properties similarity index 100% rename from samples/Cpp/AssetsManagerTest/proj.android/ant.properties rename to samples/TestCpp/proj.android/ant.properties diff --git a/samples/Cpp/TestCpp/proj.android/build.xml b/samples/TestCpp/proj.android/build.xml similarity index 100% rename from samples/Cpp/TestCpp/proj.android/build.xml rename to samples/TestCpp/proj.android/build.xml diff --git a/samples/Cpp/TestCpp/proj.android/jni/Android.mk b/samples/TestCpp/proj.android/jni/Android.mk similarity index 100% rename from samples/Cpp/TestCpp/proj.android/jni/Android.mk rename to samples/TestCpp/proj.android/jni/Android.mk diff --git a/samples/Cpp/TestCpp/proj.android/jni/Application.mk b/samples/TestCpp/proj.android/jni/Application.mk similarity index 100% rename from samples/Cpp/TestCpp/proj.android/jni/Application.mk rename to samples/TestCpp/proj.android/jni/Application.mk diff --git a/samples/Cpp/TestCpp/proj.android/jni/testcpp/main.cpp b/samples/TestCpp/proj.android/jni/testcpp/main.cpp similarity index 100% rename from samples/Cpp/TestCpp/proj.android/jni/testcpp/main.cpp rename to samples/TestCpp/proj.android/jni/testcpp/main.cpp diff --git a/samples/Cpp/TestCpp/proj.android/ndkgdb.sh b/samples/TestCpp/proj.android/ndkgdb.sh similarity index 100% rename from samples/Cpp/TestCpp/proj.android/ndkgdb.sh rename to samples/TestCpp/proj.android/ndkgdb.sh diff --git a/samples/Cpp/AssetsManagerTest/proj.android/proguard-project.txt b/samples/TestCpp/proj.android/proguard-project.txt similarity index 100% rename from samples/Cpp/AssetsManagerTest/proj.android/proguard-project.txt rename to samples/TestCpp/proj.android/proguard-project.txt diff --git a/samples/Cpp/HelloCpp/proj.android/project.properties b/samples/TestCpp/proj.android/project.properties similarity index 100% rename from samples/Cpp/HelloCpp/proj.android/project.properties rename to samples/TestCpp/proj.android/project.properties diff --git a/samples/Cpp/TestCpp/proj.android/res/values/strings.xml b/samples/TestCpp/proj.android/res/values/strings.xml similarity index 100% rename from samples/Cpp/TestCpp/proj.android/res/values/strings.xml rename to samples/TestCpp/proj.android/res/values/strings.xml diff --git a/samples/Cpp/TestCpp/proj.android/src/nojava.txt b/samples/TestCpp/proj.android/src/nojava.txt similarity index 100% rename from samples/Cpp/TestCpp/proj.android/src/nojava.txt rename to samples/TestCpp/proj.android/src/nojava.txt diff --git a/samples/Cpp/TestCpp/proj.android/src/org/cocos2dx/testcpp/Cocos2dxActivity.java b/samples/TestCpp/proj.android/src/org/cocos2dx/testcpp/Cocos2dxActivity.java similarity index 100% rename from samples/Cpp/TestCpp/proj.android/src/org/cocos2dx/testcpp/Cocos2dxActivity.java rename to samples/TestCpp/proj.android/src/org/cocos2dx/testcpp/Cocos2dxActivity.java diff --git a/samples/Cpp/TestCpp/proj.ios/Classes/RootViewController.h b/samples/TestCpp/proj.ios/Classes/RootViewController.h similarity index 100% rename from samples/Cpp/TestCpp/proj.ios/Classes/RootViewController.h rename to samples/TestCpp/proj.ios/Classes/RootViewController.h diff --git a/samples/Cpp/TestCpp/proj.ios/Classes/RootViewController.mm b/samples/TestCpp/proj.ios/Classes/RootViewController.mm similarity index 100% rename from samples/Cpp/TestCpp/proj.ios/Classes/RootViewController.mm rename to samples/TestCpp/proj.ios/Classes/RootViewController.mm diff --git a/samples/Cpp/TestCpp/proj.ios/Classes/testsAppDelegate.h b/samples/TestCpp/proj.ios/Classes/testsAppDelegate.h similarity index 100% rename from samples/Cpp/TestCpp/proj.ios/Classes/testsAppDelegate.h rename to samples/TestCpp/proj.ios/Classes/testsAppDelegate.h diff --git a/samples/Cpp/TestCpp/proj.ios/Classes/testsAppDelegate.mm b/samples/TestCpp/proj.ios/Classes/testsAppDelegate.mm similarity index 100% rename from samples/Cpp/TestCpp/proj.ios/Classes/testsAppDelegate.mm rename to samples/TestCpp/proj.ios/Classes/testsAppDelegate.mm diff --git a/samples/Cpp/HelloCpp/proj.ios/Default-568h@2x.png.REMOVED.git-id b/samples/TestCpp/proj.ios/Default-568h@2x.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/HelloCpp/proj.ios/Default-568h@2x.png.REMOVED.git-id rename to samples/TestCpp/proj.ios/Default-568h@2x.png.REMOVED.git-id diff --git a/samples/Cpp/HelloCpp/proj.ios/Default@2x.png.REMOVED.git-id b/samples/TestCpp/proj.ios/Default@2x.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/HelloCpp/proj.ios/Default@2x.png.REMOVED.git-id rename to samples/TestCpp/proj.ios/Default@2x.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/proj.ios/iphone_Prefix.pch b/samples/TestCpp/proj.ios/iphone_Prefix.pch similarity index 100% rename from samples/Cpp/TestCpp/proj.ios/iphone_Prefix.pch rename to samples/TestCpp/proj.ios/iphone_Prefix.pch diff --git a/samples/Cpp/TestCpp/proj.ios/main.m b/samples/TestCpp/proj.ios/main.m similarity index 100% rename from samples/Cpp/TestCpp/proj.ios/main.m rename to samples/TestCpp/proj.ios/main.m diff --git a/samples/Cpp/TestCpp/proj.linux/main.cpp b/samples/TestCpp/proj.linux/main.cpp similarity index 100% rename from samples/Cpp/TestCpp/proj.linux/main.cpp rename to samples/TestCpp/proj.linux/main.cpp diff --git a/samples/Cpp/HelloCpp/proj.mac/Icon.icns.REMOVED.git-id b/samples/TestCpp/proj.mac/Icon.icns.REMOVED.git-id similarity index 100% rename from samples/Cpp/HelloCpp/proj.mac/Icon.icns.REMOVED.git-id rename to samples/TestCpp/proj.mac/Icon.icns.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/proj.mac/Test_Prefix.pch b/samples/TestCpp/proj.mac/Test_Prefix.pch similarity index 100% rename from samples/Cpp/TestCpp/proj.mac/Test_Prefix.pch rename to samples/TestCpp/proj.mac/Test_Prefix.pch diff --git a/samples/Cpp/HelloCpp/proj.mac/en.lproj/InfoPlist.strings b/samples/TestCpp/proj.mac/en.lproj/InfoPlist.strings similarity index 100% rename from samples/Cpp/HelloCpp/proj.mac/en.lproj/InfoPlist.strings rename to samples/TestCpp/proj.mac/en.lproj/InfoPlist.strings diff --git a/samples/Cpp/TestCpp/proj.mac/en.lproj/MainMenu.xib b/samples/TestCpp/proj.mac/en.lproj/MainMenu.xib similarity index 100% rename from samples/Cpp/TestCpp/proj.mac/en.lproj/MainMenu.xib rename to samples/TestCpp/proj.mac/en.lproj/MainMenu.xib diff --git a/samples/Cpp/TestCpp/proj.mac/main.cpp b/samples/TestCpp/proj.mac/main.cpp similarity index 100% rename from samples/Cpp/TestCpp/proj.mac/main.cpp rename to samples/TestCpp/proj.mac/main.cpp diff --git a/samples/Cpp/TestCpp/proj.win32/TestCpp.vcxproj b/samples/TestCpp/proj.win32/TestCpp.vcxproj similarity index 100% rename from samples/Cpp/TestCpp/proj.win32/TestCpp.vcxproj rename to samples/TestCpp/proj.win32/TestCpp.vcxproj diff --git a/samples/Cpp/TestCpp/proj.win32/TestCpp.vcxproj.filters b/samples/TestCpp/proj.win32/TestCpp.vcxproj.filters similarity index 100% rename from samples/Cpp/TestCpp/proj.win32/TestCpp.vcxproj.filters rename to samples/TestCpp/proj.win32/TestCpp.vcxproj.filters diff --git a/samples/Cpp/TestCpp/proj.win32/TestCpp.vcxproj.user b/samples/TestCpp/proj.win32/TestCpp.vcxproj.user similarity index 100% rename from samples/Cpp/TestCpp/proj.win32/TestCpp.vcxproj.user rename to samples/TestCpp/proj.win32/TestCpp.vcxproj.user diff --git a/samples/Cpp/TestCpp/proj.win32/main.cpp b/samples/TestCpp/proj.win32/main.cpp similarity index 100% rename from samples/Cpp/TestCpp/proj.win32/main.cpp rename to samples/TestCpp/proj.win32/main.cpp diff --git a/samples/Cpp/HelloCpp/proj.win32/main.h b/samples/TestCpp/proj.win32/main.h similarity index 100% rename from samples/Cpp/HelloCpp/proj.win32/main.h rename to samples/TestCpp/proj.win32/main.h diff --git a/samples/Javascript/TestJavascript/Classes/AppDelegate.cpp b/samples/TestJavascript/Classes/AppDelegate.cpp similarity index 100% rename from samples/Javascript/TestJavascript/Classes/AppDelegate.cpp rename to samples/TestJavascript/Classes/AppDelegate.cpp diff --git a/samples/Javascript/CocosDragonJS/Classes/AppDelegate.h b/samples/TestJavascript/Classes/AppDelegate.h similarity index 100% rename from samples/Javascript/CocosDragonJS/Classes/AppDelegate.h rename to samples/TestJavascript/Classes/AppDelegate.h diff --git a/samples/Cpp/AssetsManagerTest/proj.android/.classpath b/samples/TestJavascript/proj.android/.classpath similarity index 100% rename from samples/Cpp/AssetsManagerTest/proj.android/.classpath rename to samples/TestJavascript/proj.android/.classpath diff --git a/samples/Javascript/TestJavascript/proj.android/.project b/samples/TestJavascript/proj.android/.project similarity index 100% rename from samples/Javascript/TestJavascript/proj.android/.project rename to samples/TestJavascript/proj.android/.project diff --git a/samples/Javascript/TestJavascript/proj.android/.settings/.jsdtscope b/samples/TestJavascript/proj.android/.settings/.jsdtscope similarity index 100% rename from samples/Javascript/TestJavascript/proj.android/.settings/.jsdtscope rename to samples/TestJavascript/proj.android/.settings/.jsdtscope diff --git a/samples/Cpp/HelloCpp/proj.android/.settings/org.eclipse.cdt.codan.core.prefs b/samples/TestJavascript/proj.android/.settings/org.eclipse.cdt.codan.core.prefs similarity index 100% rename from samples/Cpp/HelloCpp/proj.android/.settings/org.eclipse.cdt.codan.core.prefs rename to samples/TestJavascript/proj.android/.settings/org.eclipse.cdt.codan.core.prefs diff --git a/samples/Javascript/TestJavascript/proj.android/.settings/org.eclipse.wst.jsdt.ui.prefs b/samples/TestJavascript/proj.android/.settings/org.eclipse.wst.jsdt.ui.prefs similarity index 100% rename from samples/Javascript/TestJavascript/proj.android/.settings/org.eclipse.wst.jsdt.ui.prefs rename to samples/TestJavascript/proj.android/.settings/org.eclipse.wst.jsdt.ui.prefs diff --git a/samples/Javascript/TestJavascript/proj.android/.settings/org.eclipse.wst.jsdt.ui.superType.container b/samples/TestJavascript/proj.android/.settings/org.eclipse.wst.jsdt.ui.superType.container similarity index 100% rename from samples/Javascript/TestJavascript/proj.android/.settings/org.eclipse.wst.jsdt.ui.superType.container rename to samples/TestJavascript/proj.android/.settings/org.eclipse.wst.jsdt.ui.superType.container diff --git a/samples/Javascript/TestJavascript/proj.android/.settings/org.eclipse.wst.jsdt.ui.superType.name b/samples/TestJavascript/proj.android/.settings/org.eclipse.wst.jsdt.ui.superType.name similarity index 100% rename from samples/Javascript/TestJavascript/proj.android/.settings/org.eclipse.wst.jsdt.ui.superType.name rename to samples/TestJavascript/proj.android/.settings/org.eclipse.wst.jsdt.ui.superType.name diff --git a/samples/Javascript/TestJavascript/proj.android/AndroidManifest.xml b/samples/TestJavascript/proj.android/AndroidManifest.xml similarity index 100% rename from samples/Javascript/TestJavascript/proj.android/AndroidManifest.xml rename to samples/TestJavascript/proj.android/AndroidManifest.xml diff --git a/samples/Cpp/HelloCpp/proj.android/README.md b/samples/TestJavascript/proj.android/README.md similarity index 100% rename from samples/Cpp/HelloCpp/proj.android/README.md rename to samples/TestJavascript/proj.android/README.md diff --git a/samples/Javascript/CocosDragonJS/proj.android/ant.properties b/samples/TestJavascript/proj.android/ant.properties similarity index 100% rename from samples/Javascript/CocosDragonJS/proj.android/ant.properties rename to samples/TestJavascript/proj.android/ant.properties diff --git a/samples/Javascript/TestJavascript/proj.android/build.xml b/samples/TestJavascript/proj.android/build.xml similarity index 100% rename from samples/Javascript/TestJavascript/proj.android/build.xml rename to samples/TestJavascript/proj.android/build.xml diff --git a/samples/Javascript/TestJavascript/proj.android/jni/Android.mk b/samples/TestJavascript/proj.android/jni/Android.mk similarity index 100% rename from samples/Javascript/TestJavascript/proj.android/jni/Android.mk rename to samples/TestJavascript/proj.android/jni/Android.mk diff --git a/samples/Javascript/MoonWarriors/proj.android/jni/Application.mk b/samples/TestJavascript/proj.android/jni/Application.mk similarity index 100% rename from samples/Javascript/MoonWarriors/proj.android/jni/Application.mk rename to samples/TestJavascript/proj.android/jni/Application.mk diff --git a/samples/Javascript/CocosDragonJS/proj.android/jni/cocosdragonjs/main.cpp b/samples/TestJavascript/proj.android/jni/testjavascript/main.cpp similarity index 100% rename from samples/Javascript/CocosDragonJS/proj.android/jni/cocosdragonjs/main.cpp rename to samples/TestJavascript/proj.android/jni/testjavascript/main.cpp diff --git a/samples/Javascript/TestJavascript/proj.android/ndkgdb.sh b/samples/TestJavascript/proj.android/ndkgdb.sh similarity index 100% rename from samples/Javascript/TestJavascript/proj.android/ndkgdb.sh rename to samples/TestJavascript/proj.android/ndkgdb.sh diff --git a/samples/Cpp/SimpleGame/proj.android/proguard-project.txt b/samples/TestJavascript/proj.android/proguard-project.txt similarity index 100% rename from samples/Cpp/SimpleGame/proj.android/proguard-project.txt rename to samples/TestJavascript/proj.android/proguard-project.txt diff --git a/samples/Cpp/TestCpp/proj.android/project.properties b/samples/TestJavascript/proj.android/project.properties similarity index 100% rename from samples/Cpp/TestCpp/proj.android/project.properties rename to samples/TestJavascript/proj.android/project.properties diff --git a/samples/Javascript/TestJavascript/proj.android/res/values/strings.xml b/samples/TestJavascript/proj.android/res/values/strings.xml similarity index 100% rename from samples/Javascript/TestJavascript/proj.android/res/values/strings.xml rename to samples/TestJavascript/proj.android/res/values/strings.xml diff --git a/samples/Javascript/TestJavascript/proj.android/src/org/cocos2dx/testjavascript/Cocos2dxActivity.java b/samples/TestJavascript/proj.android/src/org/cocos2dx/testjavascript/Cocos2dxActivity.java similarity index 100% rename from samples/Javascript/TestJavascript/proj.android/src/org/cocos2dx/testjavascript/Cocos2dxActivity.java rename to samples/TestJavascript/proj.android/src/org/cocos2dx/testjavascript/Cocos2dxActivity.java diff --git a/samples/Javascript/CocosDragonJS/proj.ios/AppController.h b/samples/TestJavascript/proj.ios/AppController.h similarity index 100% rename from samples/Javascript/CocosDragonJS/proj.ios/AppController.h rename to samples/TestJavascript/proj.ios/AppController.h diff --git a/samples/Javascript/TestJavascript/proj.ios/AppController.mm b/samples/TestJavascript/proj.ios/AppController.mm similarity index 100% rename from samples/Javascript/TestJavascript/proj.ios/AppController.mm rename to samples/TestJavascript/proj.ios/AppController.mm diff --git a/samples/Cpp/SimpleGame/proj.ios/Default-568h@2x.png.REMOVED.git-id b/samples/TestJavascript/proj.ios/Default-568h@2x.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/SimpleGame/proj.ios/Default-568h@2x.png.REMOVED.git-id rename to samples/TestJavascript/proj.ios/Default-568h@2x.png.REMOVED.git-id diff --git a/samples/Cpp/SimpleGame/proj.ios/Default@2x.png.REMOVED.git-id b/samples/TestJavascript/proj.ios/Default@2x.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/SimpleGame/proj.ios/Default@2x.png.REMOVED.git-id rename to samples/TestJavascript/proj.ios/Default@2x.png.REMOVED.git-id diff --git a/samples/Javascript/CocosDragonJS/proj.ios/Prefix.pch b/samples/TestJavascript/proj.ios/Prefix.pch similarity index 100% rename from samples/Javascript/CocosDragonJS/proj.ios/Prefix.pch rename to samples/TestJavascript/proj.ios/Prefix.pch diff --git a/samples/Cpp/HelloCpp/proj.ios/RootViewController.h b/samples/TestJavascript/proj.ios/RootViewController.h similarity index 100% rename from samples/Cpp/HelloCpp/proj.ios/RootViewController.h rename to samples/TestJavascript/proj.ios/RootViewController.h diff --git a/samples/Javascript/CocosDragonJS/proj.ios/RootViewController.mm b/samples/TestJavascript/proj.ios/RootViewController.mm similarity index 100% rename from samples/Javascript/CocosDragonJS/proj.ios/RootViewController.mm rename to samples/TestJavascript/proj.ios/RootViewController.mm diff --git a/samples/Javascript/CocosDragonJS/proj.ios/main.m b/samples/TestJavascript/proj.ios/main.m similarity index 100% rename from samples/Javascript/CocosDragonJS/proj.ios/main.m rename to samples/TestJavascript/proj.ios/main.m diff --git a/samples/Cpp/SimpleGame/proj.mac/Icon.icns.REMOVED.git-id b/samples/TestJavascript/proj.mac/Icon.icns.REMOVED.git-id similarity index 100% rename from samples/Cpp/SimpleGame/proj.mac/Icon.icns.REMOVED.git-id rename to samples/TestJavascript/proj.mac/Icon.icns.REMOVED.git-id diff --git a/samples/Javascript/TestJavascript/proj.mac/Test_Prefix.pch b/samples/TestJavascript/proj.mac/Test_Prefix.pch similarity index 100% rename from samples/Javascript/TestJavascript/proj.mac/Test_Prefix.pch rename to samples/TestJavascript/proj.mac/Test_Prefix.pch diff --git a/samples/Cpp/SimpleGame/proj.mac/en.lproj/InfoPlist.strings b/samples/TestJavascript/proj.mac/en.lproj/InfoPlist.strings similarity index 100% rename from samples/Cpp/SimpleGame/proj.mac/en.lproj/InfoPlist.strings rename to samples/TestJavascript/proj.mac/en.lproj/InfoPlist.strings diff --git a/samples/Javascript/CocosDragonJS/proj.mac/en.lproj/MainMenu.xib b/samples/TestJavascript/proj.mac/en.lproj/MainMenu.xib similarity index 100% rename from samples/Javascript/CocosDragonJS/proj.mac/en.lproj/MainMenu.xib rename to samples/TestJavascript/proj.mac/en.lproj/MainMenu.xib diff --git a/samples/Javascript/TestJavascript/proj.mac/main.cpp b/samples/TestJavascript/proj.mac/main.cpp similarity index 100% rename from samples/Javascript/TestJavascript/proj.mac/main.cpp rename to samples/TestJavascript/proj.mac/main.cpp diff --git a/samples/Javascript/TestJavascript/proj.win32/TestJavascript.vcxproj b/samples/TestJavascript/proj.win32/TestJavascript.vcxproj similarity index 100% rename from samples/Javascript/TestJavascript/proj.win32/TestJavascript.vcxproj rename to samples/TestJavascript/proj.win32/TestJavascript.vcxproj diff --git a/samples/Javascript/TestJavascript/proj.win32/TestJavascript.vcxproj.filters b/samples/TestJavascript/proj.win32/TestJavascript.vcxproj.filters similarity index 100% rename from samples/Javascript/TestJavascript/proj.win32/TestJavascript.vcxproj.filters rename to samples/TestJavascript/proj.win32/TestJavascript.vcxproj.filters diff --git a/samples/Javascript/TestJavascript/proj.win32/TestJavascript.vcxproj.user b/samples/TestJavascript/proj.win32/TestJavascript.vcxproj.user similarity index 100% rename from samples/Javascript/TestJavascript/proj.win32/TestJavascript.vcxproj.user rename to samples/TestJavascript/proj.win32/TestJavascript.vcxproj.user diff --git a/samples/Javascript/TestJavascript/proj.win32/main.cpp b/samples/TestJavascript/proj.win32/main.cpp similarity index 100% rename from samples/Javascript/TestJavascript/proj.win32/main.cpp rename to samples/TestJavascript/proj.win32/main.cpp diff --git a/samples/Cpp/AssetsManagerTest/proj.win32/main.h b/samples/TestJavascript/proj.win32/main.h similarity index 100% rename from samples/Cpp/AssetsManagerTest/proj.win32/main.h rename to samples/TestJavascript/proj.win32/main.h diff --git a/samples/Javascript/CocosDragonJS/proj.win32/res/testjs.ico b/samples/TestJavascript/proj.win32/res/testjs.ico similarity index 100% rename from samples/Javascript/CocosDragonJS/proj.win32/res/testjs.ico rename to samples/TestJavascript/proj.win32/res/testjs.ico diff --git a/samples/Cpp/AssetsManagerTest/proj.win32/resource.h b/samples/TestJavascript/proj.win32/resource.h similarity index 100% rename from samples/Cpp/AssetsManagerTest/proj.win32/resource.h rename to samples/TestJavascript/proj.win32/resource.h diff --git a/samples/Javascript/CocosDragonJS/proj.win32/testjs.rc b/samples/TestJavascript/proj.win32/testjs.rc similarity index 100% rename from samples/Javascript/CocosDragonJS/proj.win32/testjs.rc rename to samples/TestJavascript/proj.win32/testjs.rc diff --git a/samples/Lua/TestLua/.gitignore b/samples/TestLua/.gitignore similarity index 100% rename from samples/Lua/TestLua/.gitignore rename to samples/TestLua/.gitignore diff --git a/samples/Lua/TestLua/CMakeLists.txt b/samples/TestLua/CMakeLists.txt similarity index 100% rename from samples/Lua/TestLua/CMakeLists.txt rename to samples/TestLua/CMakeLists.txt diff --git a/samples/Lua/TestLua/Classes/AppDelegate.cpp b/samples/TestLua/Classes/AppDelegate.cpp similarity index 100% rename from samples/Lua/TestLua/Classes/AppDelegate.cpp rename to samples/TestLua/Classes/AppDelegate.cpp diff --git a/samples/Lua/TestLua/Classes/AppDelegate.h b/samples/TestLua/Classes/AppDelegate.h similarity index 100% rename from samples/Lua/TestLua/Classes/AppDelegate.h rename to samples/TestLua/Classes/AppDelegate.h diff --git a/samples/Lua/TestLua/Classes/lua_assetsmanager_test_sample.cpp b/samples/TestLua/Classes/lua_assetsmanager_test_sample.cpp similarity index 100% rename from samples/Lua/TestLua/Classes/lua_assetsmanager_test_sample.cpp rename to samples/TestLua/Classes/lua_assetsmanager_test_sample.cpp diff --git a/samples/Lua/TestLua/Classes/lua_assetsmanager_test_sample.h b/samples/TestLua/Classes/lua_assetsmanager_test_sample.h similarity index 100% rename from samples/Lua/TestLua/Classes/lua_assetsmanager_test_sample.h rename to samples/TestLua/Classes/lua_assetsmanager_test_sample.h diff --git a/samples/Lua/TestLua/Resources/cocosbuilderRes/ccb/flower.jpg.REMOVED.git-id b/samples/TestLua/Resources/cocosbuilderRes/ccb/flower.jpg.REMOVED.git-id similarity index 100% rename from samples/Lua/TestLua/Resources/cocosbuilderRes/ccb/flower.jpg.REMOVED.git-id rename to samples/TestLua/Resources/cocosbuilderRes/ccb/flower.jpg.REMOVED.git-id diff --git a/samples/Lua/TestLua/Resources/cocosbuilderRes/ccb/gem-0.wav.REMOVED.git-id b/samples/TestLua/Resources/cocosbuilderRes/ccb/gem-0.wav.REMOVED.git-id similarity index 100% rename from samples/Lua/TestLua/Resources/cocosbuilderRes/ccb/gem-0.wav.REMOVED.git-id rename to samples/TestLua/Resources/cocosbuilderRes/ccb/gem-0.wav.REMOVED.git-id diff --git a/samples/Lua/TestLua/Resources/cocosbuilderRes/ccb/gem-1.wav.REMOVED.git-id b/samples/TestLua/Resources/cocosbuilderRes/ccb/gem-1.wav.REMOVED.git-id similarity index 100% rename from samples/Lua/TestLua/Resources/cocosbuilderRes/ccb/gem-1.wav.REMOVED.git-id rename to samples/TestLua/Resources/cocosbuilderRes/ccb/gem-1.wav.REMOVED.git-id diff --git a/samples/Lua/TestLua/Resources/cocosbuilderRes/ccb/markerfelt24shadow.fnt.REMOVED.git-id b/samples/TestLua/Resources/cocosbuilderRes/ccb/markerfelt24shadow.fnt.REMOVED.git-id similarity index 100% rename from samples/Lua/TestLua/Resources/cocosbuilderRes/ccb/markerfelt24shadow.fnt.REMOVED.git-id rename to samples/TestLua/Resources/cocosbuilderRes/ccb/markerfelt24shadow.fnt.REMOVED.git-id diff --git a/samples/Lua/TestLua/Resources/luaScript/AccelerometerTest/AccelerometerTest.lua b/samples/TestLua/Resources/luaScript/AccelerometerTest/AccelerometerTest.lua similarity index 100% rename from samples/Lua/TestLua/Resources/luaScript/AccelerometerTest/AccelerometerTest.lua rename to samples/TestLua/Resources/luaScript/AccelerometerTest/AccelerometerTest.lua diff --git a/samples/Lua/TestLua/Resources/luaScript/ActionManagerTest/ActionManagerTest.lua b/samples/TestLua/Resources/luaScript/ActionManagerTest/ActionManagerTest.lua similarity index 100% rename from samples/Lua/TestLua/Resources/luaScript/ActionManagerTest/ActionManagerTest.lua rename to samples/TestLua/Resources/luaScript/ActionManagerTest/ActionManagerTest.lua diff --git a/samples/Lua/TestLua/Resources/luaScript/ActionsEaseTest/ActionsEaseTest.lua b/samples/TestLua/Resources/luaScript/ActionsEaseTest/ActionsEaseTest.lua similarity index 100% rename from samples/Lua/TestLua/Resources/luaScript/ActionsEaseTest/ActionsEaseTest.lua rename to samples/TestLua/Resources/luaScript/ActionsEaseTest/ActionsEaseTest.lua diff --git a/samples/Lua/TestLua/Resources/luaScript/ActionsProgressTest/ActionsProgressTest.lua b/samples/TestLua/Resources/luaScript/ActionsProgressTest/ActionsProgressTest.lua similarity index 100% rename from samples/Lua/TestLua/Resources/luaScript/ActionsProgressTest/ActionsProgressTest.lua rename to samples/TestLua/Resources/luaScript/ActionsProgressTest/ActionsProgressTest.lua diff --git a/samples/Lua/TestLua/Resources/luaScript/ActionsTest/ActionsTest.lua b/samples/TestLua/Resources/luaScript/ActionsTest/ActionsTest.lua similarity index 100% rename from samples/Lua/TestLua/Resources/luaScript/ActionsTest/ActionsTest.lua rename to samples/TestLua/Resources/luaScript/ActionsTest/ActionsTest.lua diff --git a/samples/Lua/TestLua/Resources/luaScript/AssetsManagerTest/AssetsManagerModule.lua b/samples/TestLua/Resources/luaScript/AssetsManagerTest/AssetsManagerModule.lua similarity index 100% rename from samples/Lua/TestLua/Resources/luaScript/AssetsManagerTest/AssetsManagerModule.lua rename to samples/TestLua/Resources/luaScript/AssetsManagerTest/AssetsManagerModule.lua diff --git a/samples/Lua/TestLua/Resources/luaScript/AssetsManagerTest/AssetsManagerTest.lua b/samples/TestLua/Resources/luaScript/AssetsManagerTest/AssetsManagerTest.lua similarity index 100% rename from samples/Lua/TestLua/Resources/luaScript/AssetsManagerTest/AssetsManagerTest.lua rename to samples/TestLua/Resources/luaScript/AssetsManagerTest/AssetsManagerTest.lua diff --git a/samples/Lua/TestLua/Resources/luaScript/BugsTest/BugsTest.lua b/samples/TestLua/Resources/luaScript/BugsTest/BugsTest.lua similarity index 100% rename from samples/Lua/TestLua/Resources/luaScript/BugsTest/BugsTest.lua rename to samples/TestLua/Resources/luaScript/BugsTest/BugsTest.lua diff --git a/samples/Lua/TestLua/Resources/luaScript/ClickAndMoveTest/ClickAndMoveTest.lua b/samples/TestLua/Resources/luaScript/ClickAndMoveTest/ClickAndMoveTest.lua similarity index 100% rename from samples/Lua/TestLua/Resources/luaScript/ClickAndMoveTest/ClickAndMoveTest.lua rename to samples/TestLua/Resources/luaScript/ClickAndMoveTest/ClickAndMoveTest.lua diff --git a/samples/Lua/TestLua/Resources/luaScript/CocoStudioTest/CocoStudioArmatureTest/CocoStudioArmatureTest.lua b/samples/TestLua/Resources/luaScript/CocoStudioTest/CocoStudioArmatureTest/CocoStudioArmatureTest.lua similarity index 100% rename from samples/Lua/TestLua/Resources/luaScript/CocoStudioTest/CocoStudioArmatureTest/CocoStudioArmatureTest.lua rename to samples/TestLua/Resources/luaScript/CocoStudioTest/CocoStudioArmatureTest/CocoStudioArmatureTest.lua diff --git a/samples/Lua/TestLua/Resources/luaScript/CocoStudioTest/CocoStudioGUITest/CocoStudioGUITest.lua.REMOVED.git-id b/samples/TestLua/Resources/luaScript/CocoStudioTest/CocoStudioGUITest/CocoStudioGUITest.lua.REMOVED.git-id similarity index 100% rename from samples/Lua/TestLua/Resources/luaScript/CocoStudioTest/CocoStudioGUITest/CocoStudioGUITest.lua.REMOVED.git-id rename to samples/TestLua/Resources/luaScript/CocoStudioTest/CocoStudioGUITest/CocoStudioGUITest.lua.REMOVED.git-id diff --git a/samples/Lua/TestLua/Resources/luaScript/CocoStudioTest/CocoStudioSceneTest/CocoStudioSceneTest.lua b/samples/TestLua/Resources/luaScript/CocoStudioTest/CocoStudioSceneTest/CocoStudioSceneTest.lua similarity index 100% rename from samples/Lua/TestLua/Resources/luaScript/CocoStudioTest/CocoStudioSceneTest/CocoStudioSceneTest.lua rename to samples/TestLua/Resources/luaScript/CocoStudioTest/CocoStudioSceneTest/CocoStudioSceneTest.lua diff --git a/samples/Lua/TestLua/Resources/luaScript/CocoStudioTest/CocoStudioSceneTest/TriggerCode/acts.lua b/samples/TestLua/Resources/luaScript/CocoStudioTest/CocoStudioSceneTest/TriggerCode/acts.lua similarity index 100% rename from samples/Lua/TestLua/Resources/luaScript/CocoStudioTest/CocoStudioSceneTest/TriggerCode/acts.lua rename to samples/TestLua/Resources/luaScript/CocoStudioTest/CocoStudioSceneTest/TriggerCode/acts.lua diff --git a/samples/Lua/TestLua/Resources/luaScript/CocoStudioTest/CocoStudioSceneTest/TriggerCode/cons.lua b/samples/TestLua/Resources/luaScript/CocoStudioTest/CocoStudioSceneTest/TriggerCode/cons.lua similarity index 100% rename from samples/Lua/TestLua/Resources/luaScript/CocoStudioTest/CocoStudioSceneTest/TriggerCode/cons.lua rename to samples/TestLua/Resources/luaScript/CocoStudioTest/CocoStudioSceneTest/TriggerCode/cons.lua diff --git a/samples/Lua/TestLua/Resources/luaScript/CocoStudioTest/CocoStudioSceneTest/TriggerCode/eventDef.lua b/samples/TestLua/Resources/luaScript/CocoStudioTest/CocoStudioSceneTest/TriggerCode/eventDef.lua similarity index 100% rename from samples/Lua/TestLua/Resources/luaScript/CocoStudioTest/CocoStudioSceneTest/TriggerCode/eventDef.lua rename to samples/TestLua/Resources/luaScript/CocoStudioTest/CocoStudioSceneTest/TriggerCode/eventDef.lua diff --git a/samples/Lua/TestLua/Resources/luaScript/CocoStudioTest/CocoStudioTest.lua b/samples/TestLua/Resources/luaScript/CocoStudioTest/CocoStudioTest.lua similarity index 100% rename from samples/Lua/TestLua/Resources/luaScript/CocoStudioTest/CocoStudioTest.lua rename to samples/TestLua/Resources/luaScript/CocoStudioTest/CocoStudioTest.lua diff --git a/samples/Lua/TestLua/Resources/luaScript/CocosDenshionTest/CocosDenshionTest.lua b/samples/TestLua/Resources/luaScript/CocosDenshionTest/CocosDenshionTest.lua similarity index 100% rename from samples/Lua/TestLua/Resources/luaScript/CocosDenshionTest/CocosDenshionTest.lua rename to samples/TestLua/Resources/luaScript/CocosDenshionTest/CocosDenshionTest.lua diff --git a/samples/Lua/TestLua/Resources/luaScript/CurrentLanguageTest/CurrentLanguageTest.lua b/samples/TestLua/Resources/luaScript/CurrentLanguageTest/CurrentLanguageTest.lua similarity index 100% rename from samples/Lua/TestLua/Resources/luaScript/CurrentLanguageTest/CurrentLanguageTest.lua rename to samples/TestLua/Resources/luaScript/CurrentLanguageTest/CurrentLanguageTest.lua diff --git a/samples/Lua/TestLua/Resources/luaScript/DrawPrimitivesTest/DrawPrimitivesTest.lua b/samples/TestLua/Resources/luaScript/DrawPrimitivesTest/DrawPrimitivesTest.lua similarity index 100% rename from samples/Lua/TestLua/Resources/luaScript/DrawPrimitivesTest/DrawPrimitivesTest.lua rename to samples/TestLua/Resources/luaScript/DrawPrimitivesTest/DrawPrimitivesTest.lua diff --git a/samples/Lua/TestLua/Resources/luaScript/EffectsAdvancedTest/EffectsAdvancedTest.lua b/samples/TestLua/Resources/luaScript/EffectsAdvancedTest/EffectsAdvancedTest.lua similarity index 100% rename from samples/Lua/TestLua/Resources/luaScript/EffectsAdvancedTest/EffectsAdvancedTest.lua rename to samples/TestLua/Resources/luaScript/EffectsAdvancedTest/EffectsAdvancedTest.lua diff --git a/samples/Lua/TestLua/Resources/luaScript/EffectsTest/EffectsName.lua b/samples/TestLua/Resources/luaScript/EffectsTest/EffectsName.lua similarity index 100% rename from samples/Lua/TestLua/Resources/luaScript/EffectsTest/EffectsName.lua rename to samples/TestLua/Resources/luaScript/EffectsTest/EffectsName.lua diff --git a/samples/Lua/TestLua/Resources/luaScript/EffectsTest/EffectsTest.lua b/samples/TestLua/Resources/luaScript/EffectsTest/EffectsTest.lua similarity index 100% rename from samples/Lua/TestLua/Resources/luaScript/EffectsTest/EffectsTest.lua rename to samples/TestLua/Resources/luaScript/EffectsTest/EffectsTest.lua diff --git a/samples/Lua/TestLua/Resources/luaScript/ExtensionTest/CocosBuilderTest.lua b/samples/TestLua/Resources/luaScript/ExtensionTest/CocosBuilderTest.lua similarity index 100% rename from samples/Lua/TestLua/Resources/luaScript/ExtensionTest/CocosBuilderTest.lua rename to samples/TestLua/Resources/luaScript/ExtensionTest/CocosBuilderTest.lua diff --git a/samples/Lua/TestLua/Resources/luaScript/ExtensionTest/ExtensionTest.lua b/samples/TestLua/Resources/luaScript/ExtensionTest/ExtensionTest.lua similarity index 100% rename from samples/Lua/TestLua/Resources/luaScript/ExtensionTest/ExtensionTest.lua rename to samples/TestLua/Resources/luaScript/ExtensionTest/ExtensionTest.lua diff --git a/samples/Lua/TestLua/Resources/luaScript/ExtensionTest/WebProxyTest.lua b/samples/TestLua/Resources/luaScript/ExtensionTest/WebProxyTest.lua similarity index 100% rename from samples/Lua/TestLua/Resources/luaScript/ExtensionTest/WebProxyTest.lua rename to samples/TestLua/Resources/luaScript/ExtensionTest/WebProxyTest.lua diff --git a/samples/Lua/TestLua/Resources/luaScript/FontTest/FontTest.lua b/samples/TestLua/Resources/luaScript/FontTest/FontTest.lua similarity index 100% rename from samples/Lua/TestLua/Resources/luaScript/FontTest/FontTest.lua rename to samples/TestLua/Resources/luaScript/FontTest/FontTest.lua diff --git a/samples/Lua/TestLua/Resources/luaScript/IntervalTest/IntervalTest.lua b/samples/TestLua/Resources/luaScript/IntervalTest/IntervalTest.lua similarity index 100% rename from samples/Lua/TestLua/Resources/luaScript/IntervalTest/IntervalTest.lua rename to samples/TestLua/Resources/luaScript/IntervalTest/IntervalTest.lua diff --git a/samples/Lua/TestLua/Resources/luaScript/KeypadTest/KeypadTest.lua b/samples/TestLua/Resources/luaScript/KeypadTest/KeypadTest.lua similarity index 100% rename from samples/Lua/TestLua/Resources/luaScript/KeypadTest/KeypadTest.lua rename to samples/TestLua/Resources/luaScript/KeypadTest/KeypadTest.lua diff --git a/samples/Lua/TestLua/Resources/luaScript/LabelTest/LabelTest.lua b/samples/TestLua/Resources/luaScript/LabelTest/LabelTest.lua similarity index 100% rename from samples/Lua/TestLua/Resources/luaScript/LabelTest/LabelTest.lua rename to samples/TestLua/Resources/luaScript/LabelTest/LabelTest.lua diff --git a/samples/Lua/TestLua/Resources/luaScript/LabelTestNew/LabelTestNew.lua b/samples/TestLua/Resources/luaScript/LabelTestNew/LabelTestNew.lua similarity index 100% rename from samples/Lua/TestLua/Resources/luaScript/LabelTestNew/LabelTestNew.lua rename to samples/TestLua/Resources/luaScript/LabelTestNew/LabelTestNew.lua diff --git a/samples/Lua/TestLua/Resources/luaScript/LayerTest/LayerTest.lua b/samples/TestLua/Resources/luaScript/LayerTest/LayerTest.lua similarity index 100% rename from samples/Lua/TestLua/Resources/luaScript/LayerTest/LayerTest.lua rename to samples/TestLua/Resources/luaScript/LayerTest/LayerTest.lua diff --git a/samples/Lua/TestLua/Resources/luaScript/LuaBridgeTest/LuaBridgeTest.lua b/samples/TestLua/Resources/luaScript/LuaBridgeTest/LuaBridgeTest.lua similarity index 100% rename from samples/Lua/TestLua/Resources/luaScript/LuaBridgeTest/LuaBridgeTest.lua rename to samples/TestLua/Resources/luaScript/LuaBridgeTest/LuaBridgeTest.lua diff --git a/samples/Lua/TestLua/Resources/luaScript/MenuTest/MenuTest.lua b/samples/TestLua/Resources/luaScript/MenuTest/MenuTest.lua similarity index 100% rename from samples/Lua/TestLua/Resources/luaScript/MenuTest/MenuTest.lua rename to samples/TestLua/Resources/luaScript/MenuTest/MenuTest.lua diff --git a/samples/Lua/TestLua/Resources/luaScript/MotionStreakTest/MotionStreakTest.lua b/samples/TestLua/Resources/luaScript/MotionStreakTest/MotionStreakTest.lua similarity index 100% rename from samples/Lua/TestLua/Resources/luaScript/MotionStreakTest/MotionStreakTest.lua rename to samples/TestLua/Resources/luaScript/MotionStreakTest/MotionStreakTest.lua diff --git a/samples/Lua/TestLua/Resources/luaScript/NewEventDispatcherTest/NewEventDispatcherTest.lua b/samples/TestLua/Resources/luaScript/NewEventDispatcherTest/NewEventDispatcherTest.lua similarity index 100% rename from samples/Lua/TestLua/Resources/luaScript/NewEventDispatcherTest/NewEventDispatcherTest.lua rename to samples/TestLua/Resources/luaScript/NewEventDispatcherTest/NewEventDispatcherTest.lua diff --git a/samples/Lua/TestLua/Resources/luaScript/NodeTest/NodeTest.lua b/samples/TestLua/Resources/luaScript/NodeTest/NodeTest.lua similarity index 100% rename from samples/Lua/TestLua/Resources/luaScript/NodeTest/NodeTest.lua rename to samples/TestLua/Resources/luaScript/NodeTest/NodeTest.lua diff --git a/samples/Lua/TestLua/Resources/luaScript/OpenGLTest/OpenGLTest.lua b/samples/TestLua/Resources/luaScript/OpenGLTest/OpenGLTest.lua similarity index 100% rename from samples/Lua/TestLua/Resources/luaScript/OpenGLTest/OpenGLTest.lua rename to samples/TestLua/Resources/luaScript/OpenGLTest/OpenGLTest.lua diff --git a/samples/Lua/TestLua/Resources/luaScript/ParallaxTest/ParallaxTest.lua b/samples/TestLua/Resources/luaScript/ParallaxTest/ParallaxTest.lua similarity index 100% rename from samples/Lua/TestLua/Resources/luaScript/ParallaxTest/ParallaxTest.lua rename to samples/TestLua/Resources/luaScript/ParallaxTest/ParallaxTest.lua diff --git a/samples/Lua/TestLua/Resources/luaScript/ParticleTest/ParticleTest.lua b/samples/TestLua/Resources/luaScript/ParticleTest/ParticleTest.lua similarity index 100% rename from samples/Lua/TestLua/Resources/luaScript/ParticleTest/ParticleTest.lua rename to samples/TestLua/Resources/luaScript/ParticleTest/ParticleTest.lua diff --git a/samples/Lua/TestLua/Resources/luaScript/PerformanceTest/PerformanceSpriteTest.lua b/samples/TestLua/Resources/luaScript/PerformanceTest/PerformanceSpriteTest.lua similarity index 100% rename from samples/Lua/TestLua/Resources/luaScript/PerformanceTest/PerformanceSpriteTest.lua rename to samples/TestLua/Resources/luaScript/PerformanceTest/PerformanceSpriteTest.lua diff --git a/samples/Lua/TestLua/Resources/luaScript/PerformanceTest/PerformanceTest.lua b/samples/TestLua/Resources/luaScript/PerformanceTest/PerformanceTest.lua similarity index 100% rename from samples/Lua/TestLua/Resources/luaScript/PerformanceTest/PerformanceTest.lua rename to samples/TestLua/Resources/luaScript/PerformanceTest/PerformanceTest.lua diff --git a/samples/Lua/TestLua/Resources/luaScript/PhysicsTest/PhysicsTest.lua b/samples/TestLua/Resources/luaScript/PhysicsTest/PhysicsTest.lua similarity index 100% rename from samples/Lua/TestLua/Resources/luaScript/PhysicsTest/PhysicsTest.lua rename to samples/TestLua/Resources/luaScript/PhysicsTest/PhysicsTest.lua diff --git a/samples/Lua/TestLua/Resources/luaScript/RenderTextureTest/RenderTextureTest.lua b/samples/TestLua/Resources/luaScript/RenderTextureTest/RenderTextureTest.lua similarity index 100% rename from samples/Lua/TestLua/Resources/luaScript/RenderTextureTest/RenderTextureTest.lua rename to samples/TestLua/Resources/luaScript/RenderTextureTest/RenderTextureTest.lua diff --git a/samples/Lua/TestLua/Resources/luaScript/RotateWorldTest/RotateWorldTest.lua b/samples/TestLua/Resources/luaScript/RotateWorldTest/RotateWorldTest.lua similarity index 100% rename from samples/Lua/TestLua/Resources/luaScript/RotateWorldTest/RotateWorldTest.lua rename to samples/TestLua/Resources/luaScript/RotateWorldTest/RotateWorldTest.lua diff --git a/samples/Lua/TestLua/Resources/luaScript/SceneTest/SceneTest.lua b/samples/TestLua/Resources/luaScript/SceneTest/SceneTest.lua similarity index 100% rename from samples/Lua/TestLua/Resources/luaScript/SceneTest/SceneTest.lua rename to samples/TestLua/Resources/luaScript/SceneTest/SceneTest.lua diff --git a/samples/Lua/TestLua/Resources/luaScript/SpineTest/SpineTest.lua b/samples/TestLua/Resources/luaScript/SpineTest/SpineTest.lua similarity index 100% rename from samples/Lua/TestLua/Resources/luaScript/SpineTest/SpineTest.lua rename to samples/TestLua/Resources/luaScript/SpineTest/SpineTest.lua diff --git a/samples/Lua/TestLua/Resources/luaScript/SpriteTest/SpriteTest.lua b/samples/TestLua/Resources/luaScript/SpriteTest/SpriteTest.lua similarity index 100% rename from samples/Lua/TestLua/Resources/luaScript/SpriteTest/SpriteTest.lua rename to samples/TestLua/Resources/luaScript/SpriteTest/SpriteTest.lua diff --git a/samples/Lua/TestLua/Resources/luaScript/Texture2dTest/Texture2dTest.lua b/samples/TestLua/Resources/luaScript/Texture2dTest/Texture2dTest.lua similarity index 100% rename from samples/Lua/TestLua/Resources/luaScript/Texture2dTest/Texture2dTest.lua rename to samples/TestLua/Resources/luaScript/Texture2dTest/Texture2dTest.lua diff --git a/samples/Lua/TestLua/Resources/luaScript/TileMapTest/TileMapTest.lua b/samples/TestLua/Resources/luaScript/TileMapTest/TileMapTest.lua similarity index 100% rename from samples/Lua/TestLua/Resources/luaScript/TileMapTest/TileMapTest.lua rename to samples/TestLua/Resources/luaScript/TileMapTest/TileMapTest.lua diff --git a/samples/Lua/TestLua/Resources/luaScript/TouchesTest/Ball.lua b/samples/TestLua/Resources/luaScript/TouchesTest/Ball.lua similarity index 100% rename from samples/Lua/TestLua/Resources/luaScript/TouchesTest/Ball.lua rename to samples/TestLua/Resources/luaScript/TouchesTest/Ball.lua diff --git a/samples/Lua/TestLua/Resources/luaScript/TouchesTest/Paddle.lua b/samples/TestLua/Resources/luaScript/TouchesTest/Paddle.lua similarity index 100% rename from samples/Lua/TestLua/Resources/luaScript/TouchesTest/Paddle.lua rename to samples/TestLua/Resources/luaScript/TouchesTest/Paddle.lua diff --git a/samples/Lua/TestLua/Resources/luaScript/TouchesTest/TouchesTest.lua b/samples/TestLua/Resources/luaScript/TouchesTest/TouchesTest.lua similarity index 100% rename from samples/Lua/TestLua/Resources/luaScript/TouchesTest/TouchesTest.lua rename to samples/TestLua/Resources/luaScript/TouchesTest/TouchesTest.lua diff --git a/samples/Lua/TestLua/Resources/luaScript/TransitionsTest/TransitionsName.lua b/samples/TestLua/Resources/luaScript/TransitionsTest/TransitionsName.lua similarity index 100% rename from samples/Lua/TestLua/Resources/luaScript/TransitionsTest/TransitionsName.lua rename to samples/TestLua/Resources/luaScript/TransitionsTest/TransitionsName.lua diff --git a/samples/Lua/TestLua/Resources/luaScript/TransitionsTest/TransitionsTest.lua b/samples/TestLua/Resources/luaScript/TransitionsTest/TransitionsTest.lua similarity index 100% rename from samples/Lua/TestLua/Resources/luaScript/TransitionsTest/TransitionsTest.lua rename to samples/TestLua/Resources/luaScript/TransitionsTest/TransitionsTest.lua diff --git a/samples/Lua/TestLua/Resources/luaScript/UserDefaultTest/UserDefaultTest.lua b/samples/TestLua/Resources/luaScript/UserDefaultTest/UserDefaultTest.lua similarity index 100% rename from samples/Lua/TestLua/Resources/luaScript/UserDefaultTest/UserDefaultTest.lua rename to samples/TestLua/Resources/luaScript/UserDefaultTest/UserDefaultTest.lua diff --git a/samples/Lua/TestLua/Resources/luaScript/VisibleRect.lua b/samples/TestLua/Resources/luaScript/VisibleRect.lua similarity index 100% rename from samples/Lua/TestLua/Resources/luaScript/VisibleRect.lua rename to samples/TestLua/Resources/luaScript/VisibleRect.lua diff --git a/samples/Lua/TestLua/Resources/luaScript/XMLHttpRequestTest/XMLHttpRequestTest.lua b/samples/TestLua/Resources/luaScript/XMLHttpRequestTest/XMLHttpRequestTest.lua similarity index 100% rename from samples/Lua/TestLua/Resources/luaScript/XMLHttpRequestTest/XMLHttpRequestTest.lua rename to samples/TestLua/Resources/luaScript/XMLHttpRequestTest/XMLHttpRequestTest.lua diff --git a/samples/Lua/TestLua/Resources/luaScript/ZwoptexTest/ZwoptexTest.lua b/samples/TestLua/Resources/luaScript/ZwoptexTest/ZwoptexTest.lua similarity index 100% rename from samples/Lua/TestLua/Resources/luaScript/ZwoptexTest/ZwoptexTest.lua rename to samples/TestLua/Resources/luaScript/ZwoptexTest/ZwoptexTest.lua diff --git a/samples/Lua/TestLua/Resources/luaScript/controller.lua b/samples/TestLua/Resources/luaScript/controller.lua similarity index 100% rename from samples/Lua/TestLua/Resources/luaScript/controller.lua rename to samples/TestLua/Resources/luaScript/controller.lua diff --git a/samples/Lua/TestLua/Resources/luaScript/helper.lua b/samples/TestLua/Resources/luaScript/helper.lua similarity index 100% rename from samples/Lua/TestLua/Resources/luaScript/helper.lua rename to samples/TestLua/Resources/luaScript/helper.lua diff --git a/samples/Lua/TestLua/Resources/luaScript/mainMenu.lua b/samples/TestLua/Resources/luaScript/mainMenu.lua similarity index 100% rename from samples/Lua/TestLua/Resources/luaScript/mainMenu.lua rename to samples/TestLua/Resources/luaScript/mainMenu.lua diff --git a/samples/Lua/TestLua/Resources/luaScript/testResource.lua b/samples/TestLua/Resources/luaScript/testResource.lua similarity index 100% rename from samples/Lua/TestLua/Resources/luaScript/testResource.lua rename to samples/TestLua/Resources/luaScript/testResource.lua diff --git a/samples/Javascript/CocosDragonJS/proj.android/.classpath b/samples/TestLua/proj.android/.classpath similarity index 100% rename from samples/Javascript/CocosDragonJS/proj.android/.classpath rename to samples/TestLua/proj.android/.classpath diff --git a/samples/Lua/TestLua/proj.android/.project b/samples/TestLua/proj.android/.project similarity index 100% rename from samples/Lua/TestLua/proj.android/.project rename to samples/TestLua/proj.android/.project diff --git a/samples/Lua/TestLua/proj.android/AndroidManifest.xml b/samples/TestLua/proj.android/AndroidManifest.xml similarity index 100% rename from samples/Lua/TestLua/proj.android/AndroidManifest.xml rename to samples/TestLua/proj.android/AndroidManifest.xml diff --git a/samples/Cpp/SimpleGame/proj.android/ant.properties b/samples/TestLua/proj.android/ant.properties similarity index 100% rename from samples/Cpp/SimpleGame/proj.android/ant.properties rename to samples/TestLua/proj.android/ant.properties diff --git a/samples/Lua/TestLua/proj.android/build.xml b/samples/TestLua/proj.android/build.xml similarity index 100% rename from samples/Lua/TestLua/proj.android/build.xml rename to samples/TestLua/proj.android/build.xml diff --git a/samples/Lua/TestLua/proj.android/jni/Android.mk b/samples/TestLua/proj.android/jni/Android.mk similarity index 100% rename from samples/Lua/TestLua/proj.android/jni/Android.mk rename to samples/TestLua/proj.android/jni/Android.mk diff --git a/samples/Lua/TestLua/proj.android/jni/Application.mk b/samples/TestLua/proj.android/jni/Application.mk similarity index 100% rename from samples/Lua/TestLua/proj.android/jni/Application.mk rename to samples/TestLua/proj.android/jni/Application.mk diff --git a/samples/Lua/TestLua/proj.android/jni/testlua/main.cpp b/samples/TestLua/proj.android/jni/testlua/main.cpp similarity index 100% rename from samples/Lua/TestLua/proj.android/jni/testlua/main.cpp rename to samples/TestLua/proj.android/jni/testlua/main.cpp diff --git a/samples/Cpp/TestCpp/proj.android/proguard-project.txt b/samples/TestLua/proj.android/proguard-project.txt similarity index 100% rename from samples/Cpp/TestCpp/proj.android/proguard-project.txt rename to samples/TestLua/proj.android/proguard-project.txt diff --git a/samples/Javascript/CocosDragonJS/proj.android/project.properties b/samples/TestLua/proj.android/project.properties similarity index 100% rename from samples/Javascript/CocosDragonJS/proj.android/project.properties rename to samples/TestLua/proj.android/project.properties diff --git a/samples/Lua/TestLua/proj.android/res/values/strings.xml b/samples/TestLua/proj.android/res/values/strings.xml similarity index 100% rename from samples/Lua/TestLua/proj.android/res/values/strings.xml rename to samples/TestLua/proj.android/res/values/strings.xml diff --git a/samples/Lua/TestLua/proj.android/src/com/cocos2dx/sample/LuaJavaBridgeTest/LuaJavaBridgeTest.java b/samples/TestLua/proj.android/src/com/cocos2dx/sample/LuaJavaBridgeTest/LuaJavaBridgeTest.java similarity index 100% rename from samples/Lua/TestLua/proj.android/src/com/cocos2dx/sample/LuaJavaBridgeTest/LuaJavaBridgeTest.java rename to samples/TestLua/proj.android/src/com/cocos2dx/sample/LuaJavaBridgeTest/LuaJavaBridgeTest.java diff --git a/samples/Lua/TestLua/proj.android/src/org/cocos2dx/testlua/Cocos2dxActivity.java b/samples/TestLua/proj.android/src/org/cocos2dx/testlua/Cocos2dxActivity.java similarity index 100% rename from samples/Lua/TestLua/proj.android/src/org/cocos2dx/testlua/Cocos2dxActivity.java rename to samples/TestLua/proj.android/src/org/cocos2dx/testlua/Cocos2dxActivity.java diff --git a/samples/Cpp/HelloCpp/proj.ios/AppController.h b/samples/TestLua/proj.ios/AppController.h similarity index 100% rename from samples/Cpp/HelloCpp/proj.ios/AppController.h rename to samples/TestLua/proj.ios/AppController.h diff --git a/samples/Lua/TestLua/proj.ios/AppController.mm b/samples/TestLua/proj.ios/AppController.mm similarity index 100% rename from samples/Lua/TestLua/proj.ios/AppController.mm rename to samples/TestLua/proj.ios/AppController.mm diff --git a/samples/Cpp/TestCpp/proj.ios/Default-568h@2x.png.REMOVED.git-id b/samples/TestLua/proj.ios/Default-568h@2x.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/proj.ios/Default-568h@2x.png.REMOVED.git-id rename to samples/TestLua/proj.ios/Default-568h@2x.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/proj.ios/Default@2x.png.REMOVED.git-id b/samples/TestLua/proj.ios/Default@2x.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/proj.ios/Default@2x.png.REMOVED.git-id rename to samples/TestLua/proj.ios/Default@2x.png.REMOVED.git-id diff --git a/samples/Lua/TestLua/proj.ios/LuaObjectCBridgeTest.h b/samples/TestLua/proj.ios/LuaObjectCBridgeTest.h similarity index 100% rename from samples/Lua/TestLua/proj.ios/LuaObjectCBridgeTest.h rename to samples/TestLua/proj.ios/LuaObjectCBridgeTest.h diff --git a/samples/Lua/TestLua/proj.ios/LuaObjectCBridgeTest.mm b/samples/TestLua/proj.ios/LuaObjectCBridgeTest.mm similarity index 100% rename from samples/Lua/TestLua/proj.ios/LuaObjectCBridgeTest.mm rename to samples/TestLua/proj.ios/LuaObjectCBridgeTest.mm diff --git a/samples/Cpp/SimpleGame/proj.ios/RootViewController.h b/samples/TestLua/proj.ios/RootViewController.h similarity index 100% rename from samples/Cpp/SimpleGame/proj.ios/RootViewController.h rename to samples/TestLua/proj.ios/RootViewController.h diff --git a/samples/Cpp/SimpleGame/proj.ios/RootViewController.mm b/samples/TestLua/proj.ios/RootViewController.mm similarity index 100% rename from samples/Cpp/SimpleGame/proj.ios/RootViewController.mm rename to samples/TestLua/proj.ios/RootViewController.mm diff --git a/samples/Lua/TestLua/proj.ios/TestLua_Prefix.pch b/samples/TestLua/proj.ios/TestLua_Prefix.pch similarity index 100% rename from samples/Lua/TestLua/proj.ios/TestLua_Prefix.pch rename to samples/TestLua/proj.ios/TestLua_Prefix.pch diff --git a/samples/Lua/TestLua/proj.ios/main.m b/samples/TestLua/proj.ios/main.m similarity index 100% rename from samples/Lua/TestLua/proj.ios/main.m rename to samples/TestLua/proj.ios/main.m diff --git a/samples/Lua/TestLua/proj.linux/main.cpp b/samples/TestLua/proj.linux/main.cpp similarity index 100% rename from samples/Lua/TestLua/proj.linux/main.cpp rename to samples/TestLua/proj.linux/main.cpp diff --git a/samples/Cpp/TestCpp/proj.mac/Icon.icns.REMOVED.git-id b/samples/TestLua/proj.mac/Icon.icns.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/proj.mac/Icon.icns.REMOVED.git-id rename to samples/TestLua/proj.mac/Icon.icns.REMOVED.git-id diff --git a/samples/Lua/TestLua/proj.mac/LuaObjectCBridgeTest.h b/samples/TestLua/proj.mac/LuaObjectCBridgeTest.h similarity index 100% rename from samples/Lua/TestLua/proj.mac/LuaObjectCBridgeTest.h rename to samples/TestLua/proj.mac/LuaObjectCBridgeTest.h diff --git a/samples/Lua/TestLua/proj.mac/LuaObjectCBridgeTest.mm b/samples/TestLua/proj.mac/LuaObjectCBridgeTest.mm similarity index 100% rename from samples/Lua/TestLua/proj.mac/LuaObjectCBridgeTest.mm rename to samples/TestLua/proj.mac/LuaObjectCBridgeTest.mm diff --git a/samples/Lua/TestLua/proj.mac/TestLua_Prefix.pch b/samples/TestLua/proj.mac/TestLua_Prefix.pch similarity index 100% rename from samples/Lua/TestLua/proj.mac/TestLua_Prefix.pch rename to samples/TestLua/proj.mac/TestLua_Prefix.pch diff --git a/samples/Cpp/TestCpp/proj.mac/en.lproj/InfoPlist.strings b/samples/TestLua/proj.mac/en.lproj/InfoPlist.strings similarity index 100% rename from samples/Cpp/TestCpp/proj.mac/en.lproj/InfoPlist.strings rename to samples/TestLua/proj.mac/en.lproj/InfoPlist.strings diff --git a/samples/Cpp/HelloCpp/proj.mac/en.lproj/MainMenu.xib b/samples/TestLua/proj.mac/en.lproj/MainMenu.xib similarity index 100% rename from samples/Cpp/HelloCpp/proj.mac/en.lproj/MainMenu.xib rename to samples/TestLua/proj.mac/en.lproj/MainMenu.xib diff --git a/samples/Lua/TestLua/proj.mac/main.cpp b/samples/TestLua/proj.mac/main.cpp similarity index 100% rename from samples/Lua/TestLua/proj.mac/main.cpp rename to samples/TestLua/proj.mac/main.cpp diff --git a/samples/Lua/TestLua/proj.win32/TestLua.rc b/samples/TestLua/proj.win32/TestLua.rc similarity index 100% rename from samples/Lua/TestLua/proj.win32/TestLua.rc rename to samples/TestLua/proj.win32/TestLua.rc diff --git a/samples/Lua/TestLua/proj.win32/TestLua.win32.vcxproj b/samples/TestLua/proj.win32/TestLua.win32.vcxproj similarity index 100% rename from samples/Lua/TestLua/proj.win32/TestLua.win32.vcxproj rename to samples/TestLua/proj.win32/TestLua.win32.vcxproj diff --git a/samples/Lua/TestLua/proj.win32/TestLua.win32.vcxproj.filters b/samples/TestLua/proj.win32/TestLua.win32.vcxproj.filters similarity index 100% rename from samples/Lua/TestLua/proj.win32/TestLua.win32.vcxproj.filters rename to samples/TestLua/proj.win32/TestLua.win32.vcxproj.filters diff --git a/samples/Lua/TestLua/proj.win32/TestLua.win32.vcxproj.user b/samples/TestLua/proj.win32/TestLua.win32.vcxproj.user similarity index 100% rename from samples/Lua/TestLua/proj.win32/TestLua.win32.vcxproj.user rename to samples/TestLua/proj.win32/TestLua.win32.vcxproj.user diff --git a/samples/Lua/TestLua/proj.win32/main.cpp b/samples/TestLua/proj.win32/main.cpp similarity index 100% rename from samples/Lua/TestLua/proj.win32/main.cpp rename to samples/TestLua/proj.win32/main.cpp diff --git a/samples/Lua/TestLua/proj.win32/main.h b/samples/TestLua/proj.win32/main.h similarity index 100% rename from samples/Lua/TestLua/proj.win32/main.h rename to samples/TestLua/proj.win32/main.h diff --git a/samples/Lua/TestLua/proj.win32/res/TestLua.ico b/samples/TestLua/proj.win32/res/TestLua.ico similarity index 100% rename from samples/Lua/TestLua/proj.win32/res/TestLua.ico rename to samples/TestLua/proj.win32/res/TestLua.ico diff --git a/samples/Lua/TestLua/proj.win32/resource.h b/samples/TestLua/proj.win32/resource.h similarity index 100% rename from samples/Lua/TestLua/proj.win32/resource.h rename to samples/TestLua/proj.win32/resource.h From 5b1cea1f5929259d1c3d5576ce094c587c67aba7 Mon Sep 17 00:00:00 2001 From: James Chen Date: Tue, 28 Jan 2014 10:51:01 +0800 Subject: [PATCH 03/23] issue #3828: Moves JS-tests submodule to samples/TestJavascript/tests. --- .gitmodules | 4 ++-- samples/{Javascript/Shared => TestJavascript/tests} | 0 2 files changed, 2 insertions(+), 2 deletions(-) rename samples/{Javascript/Shared => TestJavascript/tests} (100%) diff --git a/.gitmodules b/.gitmodules index 91585f7b9a..717360b685 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,8 +4,8 @@ [submodule "cocos/scripting/auto-generated"] path = cocos/scripting/auto-generated url = git://github.com/cocos2d-x/bindings-auto-generated.git -[submodule "samples/Javascript/Shared"] - path = samples/Javascript/Shared +[submodule "samples/TestJavascript/tests"] + path = samples/TestJavascript/tests url = git://github.com/cocos2d/cocos2d-js-tests.git [submodule "tools/cocos2d-console"] path = tools/cocos2d-console diff --git a/samples/Javascript/Shared b/samples/TestJavascript/tests similarity index 100% rename from samples/Javascript/Shared rename to samples/TestJavascript/tests From e80a0b28487ed11c9da19e6c3b8e92077f077061 Mon Sep 17 00:00:00 2001 From: James Chen Date: Tue, 28 Jan 2014 11:14:16 +0800 Subject: [PATCH 04/23] issue #3828: Updates CMakeLists.txt. Removes HelloCpp/ HelloLua. --- CMakeLists.txt | 12 ------------ samples/CMakeLists.txt | 14 +++----------- 2 files changed, 3 insertions(+), 23 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 097c44290c..d143bf134e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -45,9 +45,7 @@ option(BUILD_EDITOR_SPINE "Build editor support for spine" ON) option(BUILD_EDITOR_COCOSTUDIO "Build editor support for cocostudio" ON) option(BUILD_EDITOR_COCOSBUILDER "Build editor support for cocosbuilder" ON) -option(BUILD_HelloCpp "Only build HelloCpp sample" ON) option(BUILD_TestCpp "Only build TestCpp sample" ON) -option(BUILD_HelloLua "Only build HelloLua sample" OFF) option(BUILD_TestLua "Only build TestLua sample" OFF) else()#temp @@ -63,10 +61,7 @@ option(BUILD_EDITOR_SPINE "Build editor support for spine" ON) option(BUILD_EDITOR_COCOSTUDIO "Build editor support for cocostudio" ON) option(BUILD_EDITOR_COCOSBUILDER "Build editor support for cocosbuilder" ON) - -option(BUILD_HelloCpp "Only build HelloCpp sample" ON) option(BUILD_TestCpp "Only build TestCpp sample" ON) -option(BUILD_HelloLua "Only build HelloLua sample" ON) option(BUILD_TestLua "Only build TestLua sample" ON) endif()#temp @@ -285,18 +280,11 @@ add_subdirectory(cocos/scripting) endif(BUILD_LIBS_LUA) # build samples -if(BUILD_HelloCpp) -add_subdirectory(samples/Cpp/HelloCpp) -endif(BUILD_HelloCpp) if(BUILD_TestCpp) add_subdirectory(samples/Cpp/TestCpp) endif(BUILD_TestCpp) -if(BUILD_HelloLua) -add_subdirectory(samples/Lua/HelloLua) -endif(BUILD_HelloLua) - if(BUILD_TestLua) add_subdirectory(samples/Lua/TestLua) endif(BUILD_TestLua) diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt index 198764a991..b1d1a01015 100644 --- a/samples/CMakeLists.txt +++ b/samples/CMakeLists.txt @@ -1,15 +1,7 @@ -if(BUILD_HelloCpp) -add_subdirectory(Cpp/HelloCpp) -endif(BUILD_HelloCpp) - if(BUILD_TestCpp) -add_subdirectory(Cpp/TestCpp) +add_subdirectory(TestCpp) endif(BUILD_TestCpp) -if(BUILD_HelloLua) -add_subdirectory(Lua/HelloLua) -endif(BUILD_HelloLua) - if(BUILD_TestLua) -add_subdirectory(Lua/TestLua) -endif(BUILD_TestLua) \ No newline at end of file +add_subdirectory(TestLua) +endif(BUILD_TestLua) From bc618ee4244ee875f5f75eb7d673949f7c66439e Mon Sep 17 00:00:00 2001 From: James Chen Date: Tue, 28 Jan 2014 11:34:12 +0800 Subject: [PATCH 05/23] issue #3828: Renames `TestXxx` to `test-xxx` for samples. --- samples/{TestCpp => test-cpp}/.cproject | 0 .../.externalToolBuilders/Javah_jni_builder.launch | 0 samples/{TestCpp => test-cpp}/Android.mk | 0 samples/{TestCpp => test-cpp}/CMakeLists.txt | 0 .../Classes/AccelerometerTest/AccelerometerTest.cpp | 0 .../Classes/AccelerometerTest/AccelerometerTest.h | 0 .../Classes/ActionManagerTest/ActionManagerTest.cpp | 0 .../Classes/ActionManagerTest/ActionManagerTest.h | 0 .../Classes/ActionsEaseTest/ActionsEaseTest.cpp | 0 .../Classes/ActionsEaseTest/ActionsEaseTest.h | 0 .../ActionsProgressTest/ActionsProgressTest.cpp | 0 .../ActionsProgressTest/ActionsProgressTest.h | 0 .../Classes/ActionsTest/ActionsTest.cpp | 0 .../Classes/ActionsTest/ActionsTest.h | 0 .../{TestCpp => test-cpp}/Classes/AppDelegate.cpp | 0 samples/{TestCpp => test-cpp}/Classes/AppDelegate.h | 0 samples/{TestCpp => test-cpp}/Classes/BaseTest.cpp | 0 samples/{TestCpp => test-cpp}/Classes/BaseTest.h | 0 .../Classes/Box2DTest/Box2dTest.cpp | 0 .../Classes/Box2DTest/Box2dTest.h | 0 .../Classes/Box2DTestBed/Box2dView.cpp | 0 .../Classes/Box2DTestBed/Box2dView.h | 0 .../Classes/Box2DTestBed/GLES-Render.cpp | 0 .../Classes/Box2DTestBed/GLES-Render.h | 0 .../Classes/Box2DTestBed/Test.cpp | 0 .../Classes/Box2DTestBed/Test.h | 0 .../Classes/Box2DTestBed/TestEntries.cpp | 0 .../Classes/Box2DTestBed/Tests/AddPair.h | 0 .../Classes/Box2DTestBed/Tests/ApplyForce.h | 0 .../Classes/Box2DTestBed/Tests/BodyTypes.h | 0 .../Classes/Box2DTestBed/Tests/Breakable.h | 0 .../Classes/Box2DTestBed/Tests/Bridge.h | 0 .../Classes/Box2DTestBed/Tests/BulletTest.h | 0 .../Classes/Box2DTestBed/Tests/Cantilever.h | 0 .../Classes/Box2DTestBed/Tests/Car.h | 0 .../Classes/Box2DTestBed/Tests/Chain.h | 0 .../Classes/Box2DTestBed/Tests/CharacterCollision.h | 0 .../Classes/Box2DTestBed/Tests/CollisionFiltering.h | 0 .../Box2DTestBed/Tests/CollisionProcessing.h | 0 .../Classes/Box2DTestBed/Tests/CompoundShapes.h | 0 .../Classes/Box2DTestBed/Tests/Confined.h | 0 .../Classes/Box2DTestBed/Tests/ContinuousTest.h | 0 .../Classes/Box2DTestBed/Tests/ConvexHull.h | 0 .../Classes/Box2DTestBed/Tests/ConveyorBelt.h | 0 .../Classes/Box2DTestBed/Tests/DistanceTest.h | 0 .../Classes/Box2DTestBed/Tests/Dominos.h | 0 .../Classes/Box2DTestBed/Tests/DumpShell.h | 0 .../Classes/Box2DTestBed/Tests/DynamicTreeTest.h | 0 .../Classes/Box2DTestBed/Tests/EdgeShapes.h | 0 .../Classes/Box2DTestBed/Tests/EdgeTest.h | 0 .../Classes/Box2DTestBed/Tests/Gears.h | 0 .../Classes/Box2DTestBed/Tests/Mobile.h | 0 .../Classes/Box2DTestBed/Tests/MobileBalanced.h | 0 .../Classes/Box2DTestBed/Tests/MotorJoint.h | 0 .../Classes/Box2DTestBed/Tests/OneSidedPlatform.h | 0 .../Classes/Box2DTestBed/Tests/Pinball.h | 0 .../Classes/Box2DTestBed/Tests/PolyCollision.h | 0 .../Classes/Box2DTestBed/Tests/PolyShapes.h | 0 .../Classes/Box2DTestBed/Tests/Prismatic.h | 0 .../Classes/Box2DTestBed/Tests/Pulleys.h | 0 .../Classes/Box2DTestBed/Tests/Pyramid.h | 0 .../Classes/Box2DTestBed/Tests/RayCast.h | 0 .../Classes/Box2DTestBed/Tests/Revolute.h | 0 .../Classes/Box2DTestBed/Tests/Rope.h | 0 .../Classes/Box2DTestBed/Tests/RopeJoint.h | 0 .../Classes/Box2DTestBed/Tests/SensorTest.h | 0 .../Classes/Box2DTestBed/Tests/ShapeEditing.h | 0 .../Classes/Box2DTestBed/Tests/SliderCrank.h | 0 .../Classes/Box2DTestBed/Tests/SphereStack.h | 0 .../Classes/Box2DTestBed/Tests/TheoJansen.h | 0 .../Classes/Box2DTestBed/Tests/Tiles.h | 0 .../Classes/Box2DTestBed/Tests/TimeOfImpact.h | 0 .../Classes/Box2DTestBed/Tests/Tumbler.h | 0 .../Classes/Box2DTestBed/Tests/VaryingFriction.h | 0 .../Classes/Box2DTestBed/Tests/VaryingRestitution.h | 0 .../Classes/Box2DTestBed/Tests/VerticalStack.h | 0 .../Classes/Box2DTestBed/Tests/Web.h | 0 .../Classes/BugsTest/Bug-1159.cpp | 0 .../Classes/BugsTest/Bug-1159.h | 0 .../Classes/BugsTest/Bug-1174.cpp | 0 .../Classes/BugsTest/Bug-1174.h | 0 .../Classes/BugsTest/Bug-350.cpp | 0 .../Classes/BugsTest/Bug-350.h | 0 .../Classes/BugsTest/Bug-422.cpp | 0 .../Classes/BugsTest/Bug-422.h | 0 .../Classes/BugsTest/Bug-458/Bug-458.cpp | 0 .../Classes/BugsTest/Bug-458/Bug-458.h | 0 .../BugsTest/Bug-458/QuestionContainerSprite.cpp | 0 .../BugsTest/Bug-458/QuestionContainerSprite.h | 0 .../Classes/BugsTest/Bug-624.cpp | 0 .../Classes/BugsTest/Bug-624.h | 0 .../Classes/BugsTest/Bug-886.cpp | 0 .../Classes/BugsTest/Bug-886.h | 0 .../Classes/BugsTest/Bug-899.cpp | 0 .../Classes/BugsTest/Bug-899.h | 0 .../Classes/BugsTest/Bug-914.cpp | 0 .../Classes/BugsTest/Bug-914.h | 0 .../Classes/BugsTest/BugsTest.cpp | 0 .../Classes/BugsTest/BugsTest.h | 0 .../Classes/ChipmunkTest/ChipmunkTest.cpp | 0 .../Classes/ChipmunkTest/ChipmunkTest.h | 0 .../Classes/ClickAndMoveTest/ClickAndMoveTest.cpp | 0 .../Classes/ClickAndMoveTest/ClickAndMoveTest.h | 0 .../Classes/ClippingNodeTest/ClippingNodeTest.cpp | 0 .../Classes/ClippingNodeTest/ClippingNodeTest.h | 0 .../Classes/CocosDenshionTest/CocosDenshionTest.cpp | 0 .../Classes/CocosDenshionTest/CocosDenshionTest.h | 0 .../Classes/ConfigurationTest/ConfigurationTest.cpp | 0 .../Classes/ConfigurationTest/ConfigurationTest.h | 0 .../Classes/ConsoleTest/ConsoleTest.cpp | 0 .../Classes/ConsoleTest/ConsoleTest.h | 0 .../Classes/CurlTest/CurlTest.cpp | 0 .../Classes/CurlTest/CurlTest.h | 0 .../CurrentLanguageTest/CurrentLanguageTest.cpp | 0 .../CurrentLanguageTest/CurrentLanguageTest.h | 0 .../Classes/DataVisitorTest/DataVisitorTest.cpp | 0 .../Classes/DataVisitorTest/DataVisitorTest.h | 0 .../DrawPrimitivesTest/DrawPrimitivesTest.cpp | 0 .../Classes/DrawPrimitivesTest/DrawPrimitivesTest.h | 0 .../EffectsAdvancedTest/EffectsAdvancedTest.cpp | 0 .../EffectsAdvancedTest/EffectsAdvancedTest.h | 0 .../Classes/EffectsTest/EffectsTest.cpp | 0 .../Classes/EffectsTest/EffectsTest.h | 0 .../CocoStudioArmatureTest/ArmatureScene.cpp | 0 .../CocoStudioArmatureTest/ArmatureScene.h | 0 .../ComponentsTestScene.cpp | 0 .../CocoStudioComponentsTest/ComponentsTestScene.h | 0 .../CocoStudioComponentsTest/EnemyController.cpp | 0 .../CocoStudioComponentsTest/EnemyController.h | 0 .../CocoStudioComponentsTest/GameOverScene.cpp | 0 .../CocoStudioComponentsTest/GameOverScene.h | 0 .../CocoStudioComponentsTest/PlayerController.cpp | 0 .../CocoStudioComponentsTest/PlayerController.h | 0 .../ProjectileController.cpp | 0 .../CocoStudioComponentsTest/ProjectileController.h | 0 .../CocoStudioComponentsTest/SceneController.cpp | 0 .../CocoStudioComponentsTest/SceneController.h | 0 .../CocoStudioGUITest/CocosGUIScene.cpp | 0 .../CocoStudioGUITest/CocosGUIScene.h | 0 .../CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp | 0 .../CocoStudioGUITest/UIButtonTest/UIButtonTest.h | 0 .../UICheckBoxTest/UICheckBoxTest.cpp | 0 .../UICheckBoxTest/UICheckBoxTest.h | 0 .../UIImageViewTest/UIImageViewTest.cpp | 0 .../UIImageViewTest/UIImageViewTest.h | 0 .../UILabelAtlasTest/UILabelAtlasTest.cpp | 0 .../UILabelAtlasTest/UILabelAtlasTest.h | 0 .../UILabelBMFontTest/UILabelBMFontTest.cpp | 0 .../UILabelBMFontTest/UILabelBMFontTest.h | 0 .../CocoStudioGUITest/UILabelTest/UILabelTest.cpp | 0 .../CocoStudioGUITest/UILabelTest/UILabelTest.h | 0 .../CocoStudioGUITest/UILayoutTest/UILayoutTest.cpp | 0 .../CocoStudioGUITest/UILayoutTest/UILayoutTest.h | 0 .../UIListViewTest/UIListViewTest.cpp | 0 .../UIListViewTest/UIListViewTest.h | 0 .../UILoadingBarTest/UILoadingBarTest.cpp | 0 .../UILoadingBarTest/UILoadingBarTest.h | 0 .../UIPageViewTest/UIPageViewTest.cpp | 0 .../UIPageViewTest/UIPageViewTest.h | 0 .../ExtensionsTest/CocoStudioGUITest/UIScene.cpp | 0 .../ExtensionsTest/CocoStudioGUITest/UIScene.h | 0 .../CocoStudioGUITest/UISceneManager.cpp | 0 .../CocoStudioGUITest/UISceneManager.h | 0 .../UIScrollViewTest/UIScrollViewTest.cpp | 0 .../UIScrollViewTest/UIScrollViewTest.h | 0 .../CocoStudioGUITest/UISliderTest/UISliderTest.cpp | 0 .../CocoStudioGUITest/UISliderTest/UISliderTest.h | 0 .../UITextFieldTest/UITextFieldTest.cpp | 0 .../UITextFieldTest/UITextFieldTest.h | 0 .../UIWidgetAddNodeTest/UIWidgetAddNodeTest.cpp | 0 .../UIWidgetAddNodeTest/UIWidgetAddNodeTest.h | 0 .../CocoStudioSceneTest/SceneEditorTest.cpp | 0 .../CocoStudioSceneTest/SceneEditorTest.h | 0 .../CocoStudioSceneTest/TriggerCode/EventDef.h | 0 .../CocoStudioSceneTest/TriggerCode/acts.cpp | 0 .../CocoStudioSceneTest/TriggerCode/acts.h | 0 .../CocoStudioSceneTest/TriggerCode/cons.cpp | 0 .../CocoStudioSceneTest/TriggerCode/cons.h | 0 .../AnimationsTest/AnimationsLayerLoader.h | 0 .../AnimationsTest/AnimationsTestLayer.cpp | 0 .../AnimationsTest/AnimationsTestLayer.h | 0 .../CocosBuilderTest/ButtonTest/ButtonTestLayer.cpp | 0 .../CocosBuilderTest/ButtonTest/ButtonTestLayer.h | 0 .../ButtonTest/ButtonTestLayerLoader.h | 0 .../CocosBuilderTest/CocosBuilderTest.cpp | 0 .../CocosBuilderTest/CocosBuilderTest.h | 0 .../HelloCocosBuilder/HelloCocosBuilderLayer.cpp | 0 .../HelloCocosBuilder/HelloCocosBuilderLayer.h | 0 .../HelloCocosBuilderLayerLoader.h | 0 .../CocosBuilderTest/LabelTest/LabelTestLayer.h | 0 .../LabelTest/LabelTestLayerLoader.h | 0 .../CocosBuilderTest/MenuTest/MenuTestLayer.cpp | 0 .../CocosBuilderTest/MenuTest/MenuTestLayer.h | 0 .../CocosBuilderTest/MenuTest/MenuTestLayerLoader.h | 0 .../ParticleSystemTest/ParticleSystemTestLayer.h | 0 .../ParticleSystemTestLayerLoader.h | 0 .../ScrollViewTest/ScrollViewTestLayer.h | 0 .../ScrollViewTest/ScrollViewTestLayerLoader.h | 0 .../CocosBuilderTest/SpriteTest/SpriteTestLayer.h | 0 .../SpriteTest/SpriteTestLayerLoader.h | 0 .../CocosBuilderTest/TestHeader/TestHeaderLayer.cpp | 0 .../CocosBuilderTest/TestHeader/TestHeaderLayer.h | 0 .../TestHeader/TestHeaderLayerLoader.h | 0 .../TimelineCallbackLayerLoader.h | 0 .../TimelineCallbackTestLayer.cpp | 0 .../TimelineCallbackTestLayer.h | 0 .../CCControlButtonTest/CCControlButtonTest.cpp | 0 .../CCControlButtonTest/CCControlButtonTest.h | 0 .../CCControlColourPickerTest.cpp | 0 .../CCControlColourPickerTest.h | 0 .../CCControlPotentiometerTest.cpp | 0 .../CCControlPotentiometerTest.h | 0 .../ControlExtensionTest/CCControlScene.cpp | 0 .../ControlExtensionTest/CCControlScene.h | 0 .../ControlExtensionTest/CCControlSceneManager.cpp | 0 .../ControlExtensionTest/CCControlSceneManager.h | 0 .../CCControlSliderTest/CCControlSliderTest.cpp | 0 .../CCControlSliderTest/CCControlSliderTest.h | 0 .../CCControlStepperTest/CCControlStepperTest.cpp | 0 .../CCControlStepperTest/CCControlStepperTest.h | 0 .../CCControlSwitchTest/CCControlSwitchTest.cpp | 0 .../CCControlSwitchTest/CCControlSwitchTest.h | 0 .../ExtensionsTest/EditBoxTest/EditBoxTest.cpp | 0 .../ExtensionsTest/EditBoxTest/EditBoxTest.h | 0 .../Classes/ExtensionsTest/ExtensionsTest.cpp | 0 .../Classes/ExtensionsTest/ExtensionsTest.h | 0 .../ExtensionsTest/NetworkTest/HttpClientTest.cpp | 0 .../ExtensionsTest/NetworkTest/HttpClientTest.h | 0 .../ExtensionsTest/NetworkTest/SocketIOTest.cpp | 0 .../ExtensionsTest/NetworkTest/SocketIOTest.h | 0 .../ExtensionsTest/NetworkTest/WebSocketTest.cpp | 0 .../ExtensionsTest/NetworkTest/WebSocketTest.h | 0 .../NotificationCenterTest.cpp | 0 .../NotificationCenterTest/NotificationCenterTest.h | 0 .../Scale9SpriteTest/Scale9SpriteTest.cpp | 0 .../Scale9SpriteTest/Scale9SpriteTest.h | 0 .../TableViewTest/CustomTableViewCell.cpp | 0 .../TableViewTest/CustomTableViewCell.h | 0 .../TableViewTest/TableViewTestScene.cpp | 0 .../TableViewTest/TableViewTestScene.h | 0 .../Classes/FileUtilsTest/FileUtilsTest.cpp | 0 .../Classes/FileUtilsTest/FileUtilsTest.h | 0 .../Classes/FontTest/FontTest.cpp | 0 .../Classes/FontTest/FontTest.h | 0 .../Classes/InputTest/MouseTest.cpp | 0 .../Classes/InputTest/MouseTest.h | 0 .../Classes/IntervalTest/IntervalTest.cpp | 0 .../Classes/IntervalTest/IntervalTest.h | 0 .../Classes/KeyboardTest/KeyboardTest.cpp | 0 .../Classes/KeyboardTest/KeyboardTest.h | 0 .../Classes/KeypadTest/KeypadTest.cpp | 0 .../Classes/KeypadTest/KeypadTest.h | 0 .../Classes/LabelTest/LabelTest.cpp | 0 .../Classes/LabelTest/LabelTest.h | 0 .../Classes/LabelTest/LabelTestNew.cpp | 0 .../Classes/LabelTest/LabelTestNew.h | 0 .../Classes/LayerTest/LayerTest.cpp | 0 .../Classes/LayerTest/LayerTest.h | 0 .../Classes/MenuTest/MenuTest.cpp | 0 .../Classes/MenuTest/MenuTest.h | 0 .../Classes/MotionStreakTest/MotionStreakTest.cpp | 0 .../Classes/MotionStreakTest/MotionStreakTest.h | 0 .../Classes/MutiTouchTest/MutiTouchTest.cpp | 0 .../Classes/MutiTouchTest/MutiTouchTest.h | 0 .../NewEventDispatcherTest.cpp | 0 .../NewEventDispatcherTest/NewEventDispatcherTest.h | 0 .../Classes/NewRendererTest/NewRendererTest.cpp | 0 .../Classes/NewRendererTest/NewRendererTest.h | 0 .../Classes/NodeTest/NodeTest.cpp | 0 .../Classes/NodeTest/NodeTest.h | 0 .../Classes/ParallaxTest/ParallaxTest.cpp | 0 .../Classes/ParallaxTest/ParallaxTest.h | 0 .../Classes/ParticleTest/ParticleTest.cpp | 0 .../Classes/ParticleTest/ParticleTest.h | 0 .../PerformanceTest/PerformanceAllocTest.cpp | 0 .../Classes/PerformanceTest/PerformanceAllocTest.h | 0 .../PerformanceTest/PerformanceContainerTest.cpp | 0 .../PerformanceTest/PerformanceContainerTest.h | 0 .../PerformanceEventDispatcherTest.cpp | 0 .../PerformanceEventDispatcherTest.h | 0 .../PerformanceTest/PerformanceLabelTest.cpp | 0 .../Classes/PerformanceTest/PerformanceLabelTest.h | 0 .../PerformanceTest/PerformanceNodeChildrenTest.cpp | 0 .../PerformanceTest/PerformanceNodeChildrenTest.h | 0 .../PerformanceTest/PerformanceParticleTest.cpp | 0 .../PerformanceTest/PerformanceParticleTest.h | 0 .../PerformanceTest/PerformanceRendererTest.cpp | 0 .../PerformanceTest/PerformanceRendererTest.h | 0 .../PerformanceTest/PerformanceSpriteTest.cpp | 0 .../Classes/PerformanceTest/PerformanceSpriteTest.h | 0 .../Classes/PerformanceTest/PerformanceTest.cpp | 0 .../Classes/PerformanceTest/PerformanceTest.h | 0 .../PerformanceTest/PerformanceTextureTest.cpp | 0 .../PerformanceTest/PerformanceTextureTest.h | 0 .../PerformanceTest/PerformanceTouchesTest.cpp | 0 .../PerformanceTest/PerformanceTouchesTest.h | 0 .../Classes/PhysicsTest/PhysicsTest.cpp | 0 .../Classes/PhysicsTest/PhysicsTest.h | 0 .../Classes/ReleasePoolTest/ReleasePoolTest.cpp | 0 .../Classes/ReleasePoolTest/ReleasePoolTest.h | 0 .../Classes/RenderTextureTest/RenderTextureTest.cpp | 0 .../Classes/RenderTextureTest/RenderTextureTest.h | 0 .../Classes/RotateWorldTest/RotateWorldTest.cpp | 0 .../Classes/RotateWorldTest/RotateWorldTest.h | 0 .../Classes/SceneTest/SceneTest.cpp | 0 .../Classes/SceneTest/SceneTest.h | 0 .../Classes/SchedulerTest/SchedulerTest.cpp | 0 .../Classes/SchedulerTest/SchedulerTest.h | 0 .../Classes/ShaderTest/ShaderTest.cpp | 0 .../Classes/ShaderTest/ShaderTest.h | 0 .../Classes/ShaderTest/ShaderTest2.cpp | 0 .../Classes/ShaderTest/ShaderTest2.h | 0 .../Classes/SpineTest/SpineTest.cpp | 0 .../Classes/SpineTest/SpineTest.h | 0 .../SpriteTest/SpriteTest.cpp.REMOVED.git-id | 0 .../Classes/SpriteTest/SpriteTest.h | 0 .../Classes/TextInputTest/TextInputTest.cpp | 0 .../Classes/TextInputTest/TextInputTest.h | 0 .../Classes/Texture2dTest/Texture2dTest.cpp | 0 .../Classes/Texture2dTest/Texture2dTest.h | 0 .../Classes/TextureCacheTest/TextureCacheTest.cpp | 0 .../Classes/TextureCacheTest/TextureCacheTest.h | 0 .../TextureAtlasEncryptionTest.cpp | 0 .../TextureAtlasEncryptionTest.h | 0 .../Classes/TileMapTest/TileMapTest.cpp | 0 .../Classes/TileMapTest/TileMapTest.h | 0 .../Classes/TouchesTest/Ball.cpp | 0 .../Classes/TouchesTest/Ball.h | 0 .../Classes/TouchesTest/Paddle.cpp | 0 .../Classes/TouchesTest/Paddle.h | 0 .../Classes/TouchesTest/TouchesTest.cpp | 0 .../Classes/TouchesTest/TouchesTest.h | 0 .../Classes/TransitionsTest/TransitionsTest.cpp | 0 .../Classes/TransitionsTest/TransitionsTest.h | 0 .../Classes/UnitTest/UnitTest.cpp | 0 .../Classes/UnitTest/UnitTest.h | 0 .../Classes/UserDefaultTest/UserDefaultTest.cpp | 0 .../Classes/UserDefaultTest/UserDefaultTest.h | 0 .../{TestCpp => test-cpp}/Classes/VisibleRect.cpp | 0 samples/{TestCpp => test-cpp}/Classes/VisibleRect.h | 0 .../Classes/ZwoptexTest/ZwoptexTest.cpp | 0 .../Classes/ZwoptexTest/ZwoptexTest.h | 0 .../{TestCpp => test-cpp}/Classes/controller.cpp | 0 samples/{TestCpp => test-cpp}/Classes/controller.h | 0 samples/{TestCpp => test-cpp}/Classes/testBasic.cpp | 0 samples/{TestCpp => test-cpp}/Classes/testBasic.h | 0 .../{TestCpp => test-cpp}/Classes/testResource.h | 0 samples/{TestCpp => test-cpp}/Classes/tests.h | 0 samples/{TestCpp => test-cpp}/Resources/.gitignore | 0 .../Resources/Hello.png.REMOVED.git-id | 0 .../Resources/Images/HelloWorld.png.REMOVED.git-id | 0 .../Images/PlanetCute-1024x1024.png.REMOVED.git-id | 0 .../Resources/Images/atlastest.png.REMOVED.git-id | 0 .../Resources/Images/background1.png.REMOVED.git-id | 0 .../Resources/Images/background2.jpg.REMOVED.git-id | 0 .../Resources/Images/background2.png.REMOVED.git-id | 0 .../Resources/Images/bugs/bug886.png.REMOVED.git-id | 0 .../grossini_dance_atlas-mono.png.REMOVED.git-id | 0 .../Images/landscape-1024x1024.png.REMOVED.git-id | 0 .../Resources/Images/noise.png.REMOVED.git-id | 0 .../Images/spritesheet1.png.REMOVED.git-id | 0 .../Resources/Images/stone.png.REMOVED.git-id | 0 .../Images/test_1021x1024.png.REMOVED.git-id | 0 .../Images/test_1021x1024_a8.pvr.REMOVED.git-id | 0 .../Images/test_1021x1024_rgb888.pvr.REMOVED.git-id | 0 .../test_1021x1024_rgb888.pvr.gz.REMOVED.git-id | 0 .../test_1021x1024_rgba4444.pvr.REMOVED.git-id | 0 .../test_1021x1024_rgba4444.pvr.gz.REMOVED.git-id | 0 .../test_1021x1024_rgba8888.pvr.REMOVED.git-id | 0 .../test_1021x1024_rgba8888.pvr.gz.REMOVED.git-id | 0 .../Resources/Misc/resources-hd/test4.txt | 0 .../Resources/Misc/resources-ipad/test2.txt | 0 .../Resources/Misc/resources-ipadhd/test1.txt | 0 .../Resources/Misc/resources-iphone/test6.txt | 0 .../Resources/Misc/resources-mac/test2.txt | 0 .../Resources/Misc/resources-machd/test1.txt | 0 .../Resources/Misc/resources-wide/test5.txt | 0 .../Resources/Misc/resources-widehd/test3.txt | 0 .../Resources/Misc/searchpath1/file1.txt | 0 .../Misc/searchpath2/resources-ipad/file2.txt | 0 .../Resources/Shaders/example_ColorBars.vsh | 0 .../Resources/Shaders/example_Flower.vsh | 0 .../Resources/Shaders/example_Heart.vsh | 0 .../Resources/Shaders/example_Julia.vsh | 0 .../Resources/Shaders/example_Mandelbrot.vsh | 0 .../Resources/Shaders/example_Monjori.vsh | 0 .../Resources/Shaders/example_Plasma.vsh | 0 .../Resources/Shaders/example_Twist.vsh | 0 .../TileMaps/hexa-tiles.png.REMOVED.git-id | 0 .../Resources/TileMaps/map/slcj.png.REMOVED.git-id | 0 .../TileMaps/ortho-test1.png.REMOVED.git-id | 0 .../TileMaps/ortho-test1_bw.png.REMOVED.git-id | 0 .../Resources/animations/grossini.plist.xml | 0 .../armature/Cowboy.ExportJson.REMOVED.git-id | 0 .../Resources/armature/Cowboy0.png.REMOVED.git-id | 0 .../Resources/armature/Dragon.xml | 0 .../HeroAnimation.ExportJson.REMOVED.git-id | 0 .../Resources/armature/cyborg.xml | 0 .../Resources/armature/knight.xml | 0 .../Resources/armature/robot.xml | 0 .../Resources/armature/weapon.xml | 0 .../background-music-aac.wav.REMOVED.git-id | 0 .../Resources/background.mp3.REMOVED.git-id | 0 .../Resources/ccb/flower.jpg.REMOVED.git-id | 0 .../Resources/ccb/gem-0.wav.REMOVED.git-id | 0 .../Resources/ccb/gem-1.wav.REMOVED.git-id | 0 .../ccb/markerfelt24shadow.fnt.REMOVED.git-id | 0 .../Resources/cocosgui/Hello.png.REMOVED.git-id | 0 .../cocosgui/UITest/background.png.REMOVED.git-id | 0 .../Resources/cocosgui/b11.png.REMOVED.git-id | 0 .../cocosgui/bitmapFontTest2.png.REMOVED.git-id | 0 .../cocosgui/examples/examples.json.REMOVED.git-id | 0 .../gui_examples/map_1/map_pve.png.REMOVED.git-id | 0 .../page_1/background.png.REMOVED.git-id | 0 .../extensions/background.png.REMOVED.git-id | 0 .../Resources/fonts/Courier New.ttf.REMOVED.git-id | 0 .../Resources/fonts/Thonburi.ttf.REMOVED.git-id | 0 .../Resources/fonts/ThonburiBold.ttf.REMOVED.git-id | 0 .../fonts/arial-26-en-ru_0.png.REMOVED.git-id | 0 .../Resources/fonts/arial-unicode-26.GlyphProject | Bin .../fonts/arial-unicode-26.png.REMOVED.git-id | 0 .../Resources/fonts/arial.ttf.REMOVED.git-id | 0 .../fonts/bitmapFontChinese.png.REMOVED.git-id | 0 .../fonts/bitmapFontTest.png.REMOVED.git-id | 0 .../fonts/bitmapFontTest2.bmp.REMOVED.git-id | 0 .../fonts/bitmapFontTest2.png.REMOVED.git-id | 0 .../fonts/boundsTestFont.png.REMOVED.git-id | 0 .../fonts/font-issue1343-hd.png.REMOVED.git-id | 0 .../Resources/fonts/futura-48.png.REMOVED.git-id | 0 .../fonts/helvetica-geneva-32.png.REMOVED.git-id | 0 .../Resources/fonts/markerFelt.fnt.REMOVED.git-id | 0 .../Resources/fonts/strings.xml | 0 .../Resources/fonts/tahoma.ttf.REMOVED.git-id | 0 .../Resources/fonts/wt021.ttf.REMOVED.git-id | 0 .../hd/Images/background1.png.REMOVED.git-id | 0 .../hd/Images/background2.jpg.REMOVED.git-id | 0 .../hd/Images/background2.png.REMOVED.git-id | 0 .../hd/armature/Cowboy0.png.REMOVED.git-id | 0 .../Resources/hd/armature/Dragon.png.REMOVED.git-id | 0 .../hd/armature/HeroAnimation0.png.REMOVED.git-id | 0 .../Resources/hd/armature/weapon.png.REMOVED.git-id | 0 .../Resources/hd/ccb/burst.png.REMOVED.git-id | 0 .../Resources/hd/cocosgui/Hello.png.REMOVED.git-id | 0 .../cocosgui/UITest/background.png.REMOVED.git-id | 0 .../Resources/hd/cocosgui/b11.png.REMOVED.git-id | 0 .../hd/cocosgui/bitmapFontTest2.png.REMOVED.git-id | 0 .../cocosgui/examples/examples.json.REMOVED.git-id | 0 .../gui_examples/map_1/map_pve.png.REMOVED.git-id | 0 .../page_1/background.png.REMOVED.git-id | 0 .../hd/extensions/background.png.REMOVED.git-id | 0 .../hd/fonts/font-issue1343.png.REMOVED.git-id | 0 .../hd/fonts/markerFelt.fnt.REMOVED.git-id | 0 .../hd/fonts/markerFelt.png.REMOVED.git-id | 0 .../tuffy_bold_italic-charmap.png.REMOVED.git-id | 0 .../Images/startMenuBG.png.REMOVED.git-id | 0 .../Butterflyfish/Butterflyfish0.png.REMOVED.git-id | 0 .../fishes/blowFish/Blowfish0.png.REMOVED.git-id | 0 .../Images/startMenuBG.png.REMOVED.git-id | 0 .../Misc/music_logo.mp3.REMOVED.git-id | 0 .../Misc/music_logo.wav.REMOVED.git-id | 0 .../Fish_UI/starMenuButton01.png.REMOVED.git-id | 0 .../Fish_UI/starMenuButton02.png.REMOVED.git-id | 0 .../Fish_UI/ui_logo_001-hd.png.REMOVED.git-id | 0 .../CowBoy/Cowboy.ExportJson.REMOVED.git-id | 0 .../CowBoy/Cowboy0.png.REMOVED.git-id | 0 .../Images/startMenuBG.png.REMOVED.git-id | 0 .../Misc/music_logo.mp3.REMOVED.git-id | 0 .../Misc/music_logo.wav.REMOVED.git-id | 0 .../Butterflyfish/Butterflyfish0.png.REMOVED.git-id | 0 .../fishes/blowFish/Blowfish0.png.REMOVED.git-id | 0 .../Fish_UI/starMenuButton01.png.REMOVED.git-id | 0 .../Fish_UI/starMenuButton02.png.REMOVED.git-id | 0 .../Fish_UI/ui_logo_001-hd.png.REMOVED.git-id | 0 .../Images/startMenuBG.png.REMOVED.git-id | 0 .../Butterflyfish/Butterflyfish0.png.REMOVED.git-id | 0 .../fishes/blowFish/Blowfish0.png.REMOVED.git-id | 0 .../Images/startMenuBG.png.REMOVED.git-id | 0 .../Butterflyfish/Butterflyfish0.png.REMOVED.git-id | 0 .../fishes/blowFish/Blowfish0.png.REMOVED.git-id | 0 .../Resources/hd/spine/goblins.png.REMOVED.git-id | 0 .../Resources/hd/spine/spineboy.png.REMOVED.git-id | 0 .../Resources/ipad/ccb/burst.png.REMOVED.git-id | 0 .../ipad/extensions/background.png.REMOVED.git-id | 0 .../Images/startMenuBG.png.REMOVED.git-id | 0 .../Butterflyfish/Butterflyfish0.png.REMOVED.git-id | 0 .../fishes/blowFish/Blowfish0.png.REMOVED.git-id | 0 .../Images/startMenuBG.png.REMOVED.git-id | 0 .../Misc/music_logo.mp3.REMOVED.git-id | 0 .../Misc/music_logo.wav.REMOVED.git-id | 0 .../Fish_UI/ui_logo_001-hd.png.REMOVED.git-id | 0 .../CowBoy/Cowboy.ExportJson.REMOVED.git-id | 0 .../CowBoy/Cowboy0.png.REMOVED.git-id | 0 .../Images/startMenuBG.png.REMOVED.git-id | 0 .../Misc/music_logo.mp3.REMOVED.git-id | 0 .../Misc/music_logo.wav.REMOVED.git-id | 0 .../Butterflyfish/Butterflyfish0.png.REMOVED.git-id | 0 .../fishes/blowFish/Blowfish0.png.REMOVED.git-id | 0 .../Fish_UI/ui_logo_001-hd.png.REMOVED.git-id | 0 .../Images/startMenuBG.png.REMOVED.git-id | 0 .../Butterflyfish/Butterflyfish0.png.REMOVED.git-id | 0 .../fishes/blowFish/Blowfish0.png.REMOVED.git-id | 0 .../Images/startMenuBG.png.REMOVED.git-id | 0 .../Butterflyfish/Butterflyfish0.png.REMOVED.git-id | 0 .../fishes/blowFish/Blowfish0.png.REMOVED.git-id | 0 .../Resources/spine/goblins.png.REMOVED.git-id | 0 .../{TestCpp => test-cpp}/proj.android/.classpath | 0 .../.externalToolBuilders/Javah_jni_builder.launch | 0 samples/{TestCpp => test-cpp}/proj.android/.project | 0 .../.settings/org.eclipse.cdt.codan.core.prefs | 0 .../proj.android/AndroidManifest.xml | 0 .../{TestCpp => test-cpp}/proj.android/README.md | 0 .../proj.android/ant.properties | 0 .../{TestCpp => test-cpp}/proj.android/build.xml | 0 .../proj.android/jni/Android.mk | 0 .../proj.android/jni/Application.mk | 0 .../proj.android/jni/testcpp/main.cpp | 0 .../{TestCpp => test-cpp}/proj.android/ndkgdb.sh | 0 .../proj.android/proguard-project.txt | 0 .../proj.android/project.properties | 0 .../proj.android/res/values/strings.xml | 0 .../proj.android/src/nojava.txt | 0 .../src/org/cocos2dx/testcpp/Cocos2dxActivity.java | 0 .../proj.ios/Classes/RootViewController.h | 0 .../proj.ios/Classes/RootViewController.mm | 0 .../proj.ios/Classes/testsAppDelegate.h | 0 .../proj.ios/Classes/testsAppDelegate.mm | 0 .../proj.ios/Default-568h@2x.png.REMOVED.git-id | 0 .../proj.ios/Default@2x.png.REMOVED.git-id | 0 .../proj.ios/iphone_Prefix.pch | 0 samples/{TestCpp => test-cpp}/proj.ios/main.m | 0 samples/{TestCpp => test-cpp}/proj.linux/main.cpp | 0 .../proj.mac/Icon.icns.REMOVED.git-id | 0 .../{TestCpp => test-cpp}/proj.mac/Test_Prefix.pch | 0 .../proj.mac/en.lproj/InfoPlist.strings | 0 .../proj.mac/en.lproj/MainMenu.xib | 0 samples/{TestCpp => test-cpp}/proj.mac/main.cpp | 0 .../proj.win32/TestCpp.vcxproj | 0 .../proj.win32/TestCpp.vcxproj.filters | 0 .../proj.win32/TestCpp.vcxproj.user | 0 samples/{TestCpp => test-cpp}/proj.win32/main.cpp | 0 samples/{TestCpp => test-cpp}/proj.win32/main.h | 0 .../Classes/AppDelegate.cpp | 0 .../Classes/AppDelegate.h | 0 .../proj.android/.classpath | 0 .../proj.android/.project | 0 .../proj.android/.settings/.jsdtscope | 0 .../.settings/org.eclipse.cdt.codan.core.prefs | 0 .../.settings/org.eclipse.wst.jsdt.ui.prefs | 0 .../org.eclipse.wst.jsdt.ui.superType.container | 0 .../org.eclipse.wst.jsdt.ui.superType.name | 0 .../proj.android/AndroidManifest.xml | 0 .../proj.android/README.md | 0 .../proj.android/ant.properties | 0 .../proj.android/build.xml | 0 .../proj.android/jni/Android.mk | 0 .../proj.android/jni/Application.mk | 0 .../proj.android/jni/testjavascript/main.cpp | 0 .../proj.android/ndkgdb.sh | 0 .../proj.android/proguard-project.txt | 0 .../proj.android/project.properties | 0 .../proj.android/res/values/strings.xml | 0 .../cocos2dx/testjavascript/Cocos2dxActivity.java | 0 .../proj.ios/AppController.h | 0 .../proj.ios/AppController.mm | 0 .../proj.ios/Default-568h@2x.png.REMOVED.git-id | 0 .../proj.ios/Default@2x.png.REMOVED.git-id | 0 .../proj.ios/Prefix.pch | 0 .../proj.ios/RootViewController.h | 0 .../proj.ios/RootViewController.mm | 0 .../proj.ios/main.m | 0 .../proj.mac/Icon.icns.REMOVED.git-id | 0 .../proj.mac/Test_Prefix.pch | 0 .../proj.mac/en.lproj/InfoPlist.strings | 0 .../proj.mac/en.lproj/MainMenu.xib | 0 .../proj.mac/main.cpp | 0 .../proj.win32/TestJavascript.vcxproj | 0 .../proj.win32/TestJavascript.vcxproj.filters | 0 .../proj.win32/TestJavascript.vcxproj.user | 0 .../proj.win32/main.cpp | 0 .../proj.win32/main.h | 0 .../proj.win32/res/testjs.ico | Bin .../proj.win32/resource.h | 0 .../proj.win32/testjs.rc | 0 samples/{TestLua => test-lua}/.gitignore | 0 samples/{TestLua => test-lua}/CMakeLists.txt | 0 .../{TestLua => test-lua}/Classes/AppDelegate.cpp | 0 samples/{TestLua => test-lua}/Classes/AppDelegate.h | 0 .../Classes/lua_assetsmanager_test_sample.cpp | 0 .../Classes/lua_assetsmanager_test_sample.h | 0 .../cocosbuilderRes/ccb/flower.jpg.REMOVED.git-id | 0 .../cocosbuilderRes/ccb/gem-0.wav.REMOVED.git-id | 0 .../cocosbuilderRes/ccb/gem-1.wav.REMOVED.git-id | 0 .../ccb/markerfelt24shadow.fnt.REMOVED.git-id | 0 .../AccelerometerTest/AccelerometerTest.lua | 0 .../ActionManagerTest/ActionManagerTest.lua | 0 .../luaScript/ActionsEaseTest/ActionsEaseTest.lua | 0 .../ActionsProgressTest/ActionsProgressTest.lua | 0 .../Resources/luaScript/ActionsTest/ActionsTest.lua | 0 .../AssetsManagerTest/AssetsManagerModule.lua | 0 .../AssetsManagerTest/AssetsManagerTest.lua | 0 .../Resources/luaScript/BugsTest/BugsTest.lua | 0 .../luaScript/ClickAndMoveTest/ClickAndMoveTest.lua | 0 .../CocoStudioArmatureTest.lua | 0 .../CocoStudioGUITest.lua.REMOVED.git-id | 0 .../CocoStudioSceneTest/CocoStudioSceneTest.lua | 0 .../CocoStudioSceneTest/TriggerCode/acts.lua | 0 .../CocoStudioSceneTest/TriggerCode/cons.lua | 0 .../CocoStudioSceneTest/TriggerCode/eventDef.lua | 0 .../luaScript/CocoStudioTest/CocoStudioTest.lua | 0 .../CocosDenshionTest/CocosDenshionTest.lua | 0 .../CurrentLanguageTest/CurrentLanguageTest.lua | 0 .../DrawPrimitivesTest/DrawPrimitivesTest.lua | 0 .../EffectsAdvancedTest/EffectsAdvancedTest.lua | 0 .../Resources/luaScript/EffectsTest/EffectsName.lua | 0 .../Resources/luaScript/EffectsTest/EffectsTest.lua | 0 .../luaScript/ExtensionTest/CocosBuilderTest.lua | 0 .../luaScript/ExtensionTest/ExtensionTest.lua | 0 .../luaScript/ExtensionTest/WebProxyTest.lua | 0 .../Resources/luaScript/FontTest/FontTest.lua | 0 .../luaScript/IntervalTest/IntervalTest.lua | 0 .../Resources/luaScript/KeypadTest/KeypadTest.lua | 0 .../Resources/luaScript/LabelTest/LabelTest.lua | 0 .../luaScript/LabelTestNew/LabelTestNew.lua | 0 .../Resources/luaScript/LayerTest/LayerTest.lua | 0 .../luaScript/LuaBridgeTest/LuaBridgeTest.lua | 0 .../Resources/luaScript/MenuTest/MenuTest.lua | 0 .../luaScript/MotionStreakTest/MotionStreakTest.lua | 0 .../NewEventDispatcherTest.lua | 0 .../Resources/luaScript/NodeTest/NodeTest.lua | 0 .../Resources/luaScript/OpenGLTest/OpenGLTest.lua | 0 .../luaScript/ParallaxTest/ParallaxTest.lua | 0 .../luaScript/ParticleTest/ParticleTest.lua | 0 .../PerformanceTest/PerformanceSpriteTest.lua | 0 .../luaScript/PerformanceTest/PerformanceTest.lua | 0 .../Resources/luaScript/PhysicsTest/PhysicsTest.lua | 0 .../RenderTextureTest/RenderTextureTest.lua | 0 .../luaScript/RotateWorldTest/RotateWorldTest.lua | 0 .../Resources/luaScript/SceneTest/SceneTest.lua | 0 .../Resources/luaScript/SpineTest/SpineTest.lua | 0 .../Resources/luaScript/SpriteTest/SpriteTest.lua | 0 .../luaScript/Texture2dTest/Texture2dTest.lua | 0 .../Resources/luaScript/TileMapTest/TileMapTest.lua | 0 .../Resources/luaScript/TouchesTest/Ball.lua | 0 .../Resources/luaScript/TouchesTest/Paddle.lua | 0 .../Resources/luaScript/TouchesTest/TouchesTest.lua | 0 .../luaScript/TransitionsTest/TransitionsName.lua | 0 .../luaScript/TransitionsTest/TransitionsTest.lua | 0 .../luaScript/UserDefaultTest/UserDefaultTest.lua | 0 .../Resources/luaScript/VisibleRect.lua | 0 .../XMLHttpRequestTest/XMLHttpRequestTest.lua | 0 .../Resources/luaScript/ZwoptexTest/ZwoptexTest.lua | 0 .../Resources/luaScript/controller.lua | 0 .../Resources/luaScript/helper.lua | 0 .../Resources/luaScript/mainMenu.lua | 0 .../Resources/luaScript/testResource.lua | 0 .../{TestLua => test-lua}/proj.android/.classpath | 0 samples/{TestLua => test-lua}/proj.android/.project | 0 .../proj.android/AndroidManifest.xml | 0 .../proj.android/ant.properties | 0 .../{TestLua => test-lua}/proj.android/build.xml | 0 .../proj.android/jni/Android.mk | 0 .../proj.android/jni/Application.mk | 0 .../proj.android/jni/testlua/main.cpp | 0 .../proj.android/proguard-project.txt | 0 .../proj.android/project.properties | 0 .../proj.android/res/values/strings.xml | 0 .../sample/LuaJavaBridgeTest/LuaJavaBridgeTest.java | 0 .../src/org/cocos2dx/testlua/Cocos2dxActivity.java | 0 .../{TestLua => test-lua}/proj.ios/AppController.h | 0 .../{TestLua => test-lua}/proj.ios/AppController.mm | 0 .../proj.ios/Default-568h@2x.png.REMOVED.git-id | 0 .../proj.ios/Default@2x.png.REMOVED.git-id | 0 .../proj.ios/LuaObjectCBridgeTest.h | 0 .../proj.ios/LuaObjectCBridgeTest.mm | 0 .../proj.ios/RootViewController.h | 0 .../proj.ios/RootViewController.mm | 0 .../proj.ios/TestLua_Prefix.pch | 0 samples/{TestLua => test-lua}/proj.ios/main.m | 0 samples/{TestLua => test-lua}/proj.linux/main.cpp | 0 .../proj.mac/Icon.icns.REMOVED.git-id | 0 .../proj.mac/LuaObjectCBridgeTest.h | 0 .../proj.mac/LuaObjectCBridgeTest.mm | 0 .../proj.mac/TestLua_Prefix.pch | 0 .../proj.mac/en.lproj/InfoPlist.strings | 0 .../proj.mac/en.lproj/MainMenu.xib | 0 samples/{TestLua => test-lua}/proj.mac/main.cpp | 0 samples/{TestLua => test-lua}/proj.win32/TestLua.rc | 0 .../proj.win32/TestLua.win32.vcxproj | 0 .../proj.win32/TestLua.win32.vcxproj.filters | 0 .../proj.win32/TestLua.win32.vcxproj.user | 0 samples/{TestLua => test-lua}/proj.win32/main.cpp | 0 samples/{TestLua => test-lua}/proj.win32/main.h | 0 .../proj.win32/res/TestLua.ico | Bin samples/{TestLua => test-lua}/proj.win32/resource.h | 0 694 files changed, 0 insertions(+), 0 deletions(-) rename samples/{TestCpp => test-cpp}/.cproject (100%) rename samples/{TestCpp => test-cpp}/.externalToolBuilders/Javah_jni_builder.launch (100%) rename samples/{TestCpp => test-cpp}/Android.mk (100%) rename samples/{TestCpp => test-cpp}/CMakeLists.txt (100%) rename samples/{TestCpp => test-cpp}/Classes/AccelerometerTest/AccelerometerTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/AccelerometerTest/AccelerometerTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/ActionManagerTest/ActionManagerTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/ActionManagerTest/ActionManagerTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/ActionsEaseTest/ActionsEaseTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/ActionsEaseTest/ActionsEaseTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/ActionsProgressTest/ActionsProgressTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/ActionsProgressTest/ActionsProgressTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/ActionsTest/ActionsTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/ActionsTest/ActionsTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/AppDelegate.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/AppDelegate.h (100%) rename samples/{TestCpp => test-cpp}/Classes/BaseTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/BaseTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/Box2DTest/Box2dTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/Box2DTest/Box2dTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/Box2DTestBed/Box2dView.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/Box2DTestBed/Box2dView.h (100%) rename samples/{TestCpp => test-cpp}/Classes/Box2DTestBed/GLES-Render.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/Box2DTestBed/GLES-Render.h (100%) rename samples/{TestCpp => test-cpp}/Classes/Box2DTestBed/Test.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/Box2DTestBed/Test.h (100%) rename samples/{TestCpp => test-cpp}/Classes/Box2DTestBed/TestEntries.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/Box2DTestBed/Tests/AddPair.h (100%) rename samples/{TestCpp => test-cpp}/Classes/Box2DTestBed/Tests/ApplyForce.h (100%) rename samples/{TestCpp => test-cpp}/Classes/Box2DTestBed/Tests/BodyTypes.h (100%) rename samples/{TestCpp => test-cpp}/Classes/Box2DTestBed/Tests/Breakable.h (100%) rename samples/{TestCpp => test-cpp}/Classes/Box2DTestBed/Tests/Bridge.h (100%) rename samples/{TestCpp => test-cpp}/Classes/Box2DTestBed/Tests/BulletTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/Box2DTestBed/Tests/Cantilever.h (100%) rename samples/{TestCpp => test-cpp}/Classes/Box2DTestBed/Tests/Car.h (100%) rename samples/{TestCpp => test-cpp}/Classes/Box2DTestBed/Tests/Chain.h (100%) rename samples/{TestCpp => test-cpp}/Classes/Box2DTestBed/Tests/CharacterCollision.h (100%) rename samples/{TestCpp => test-cpp}/Classes/Box2DTestBed/Tests/CollisionFiltering.h (100%) rename samples/{TestCpp => test-cpp}/Classes/Box2DTestBed/Tests/CollisionProcessing.h (100%) rename samples/{TestCpp => test-cpp}/Classes/Box2DTestBed/Tests/CompoundShapes.h (100%) rename samples/{TestCpp => test-cpp}/Classes/Box2DTestBed/Tests/Confined.h (100%) rename samples/{TestCpp => test-cpp}/Classes/Box2DTestBed/Tests/ContinuousTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/Box2DTestBed/Tests/ConvexHull.h (100%) rename samples/{TestCpp => test-cpp}/Classes/Box2DTestBed/Tests/ConveyorBelt.h (100%) rename samples/{TestCpp => test-cpp}/Classes/Box2DTestBed/Tests/DistanceTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/Box2DTestBed/Tests/Dominos.h (100%) rename samples/{TestCpp => test-cpp}/Classes/Box2DTestBed/Tests/DumpShell.h (100%) rename samples/{TestCpp => test-cpp}/Classes/Box2DTestBed/Tests/DynamicTreeTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/Box2DTestBed/Tests/EdgeShapes.h (100%) rename samples/{TestCpp => test-cpp}/Classes/Box2DTestBed/Tests/EdgeTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/Box2DTestBed/Tests/Gears.h (100%) rename samples/{TestCpp => test-cpp}/Classes/Box2DTestBed/Tests/Mobile.h (100%) rename samples/{TestCpp => test-cpp}/Classes/Box2DTestBed/Tests/MobileBalanced.h (100%) rename samples/{TestCpp => test-cpp}/Classes/Box2DTestBed/Tests/MotorJoint.h (100%) rename samples/{TestCpp => test-cpp}/Classes/Box2DTestBed/Tests/OneSidedPlatform.h (100%) rename samples/{TestCpp => test-cpp}/Classes/Box2DTestBed/Tests/Pinball.h (100%) rename samples/{TestCpp => test-cpp}/Classes/Box2DTestBed/Tests/PolyCollision.h (100%) rename samples/{TestCpp => test-cpp}/Classes/Box2DTestBed/Tests/PolyShapes.h (100%) rename samples/{TestCpp => test-cpp}/Classes/Box2DTestBed/Tests/Prismatic.h (100%) rename samples/{TestCpp => test-cpp}/Classes/Box2DTestBed/Tests/Pulleys.h (100%) rename samples/{TestCpp => test-cpp}/Classes/Box2DTestBed/Tests/Pyramid.h (100%) rename samples/{TestCpp => test-cpp}/Classes/Box2DTestBed/Tests/RayCast.h (100%) rename samples/{TestCpp => test-cpp}/Classes/Box2DTestBed/Tests/Revolute.h (100%) rename samples/{TestCpp => test-cpp}/Classes/Box2DTestBed/Tests/Rope.h (100%) rename samples/{TestCpp => test-cpp}/Classes/Box2DTestBed/Tests/RopeJoint.h (100%) rename samples/{TestCpp => test-cpp}/Classes/Box2DTestBed/Tests/SensorTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/Box2DTestBed/Tests/ShapeEditing.h (100%) rename samples/{TestCpp => test-cpp}/Classes/Box2DTestBed/Tests/SliderCrank.h (100%) rename samples/{TestCpp => test-cpp}/Classes/Box2DTestBed/Tests/SphereStack.h (100%) rename samples/{TestCpp => test-cpp}/Classes/Box2DTestBed/Tests/TheoJansen.h (100%) rename samples/{TestCpp => test-cpp}/Classes/Box2DTestBed/Tests/Tiles.h (100%) rename samples/{TestCpp => test-cpp}/Classes/Box2DTestBed/Tests/TimeOfImpact.h (100%) rename samples/{TestCpp => test-cpp}/Classes/Box2DTestBed/Tests/Tumbler.h (100%) rename samples/{TestCpp => test-cpp}/Classes/Box2DTestBed/Tests/VaryingFriction.h (100%) rename samples/{TestCpp => test-cpp}/Classes/Box2DTestBed/Tests/VaryingRestitution.h (100%) rename samples/{TestCpp => test-cpp}/Classes/Box2DTestBed/Tests/VerticalStack.h (100%) rename samples/{TestCpp => test-cpp}/Classes/Box2DTestBed/Tests/Web.h (100%) rename samples/{TestCpp => test-cpp}/Classes/BugsTest/Bug-1159.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/BugsTest/Bug-1159.h (100%) rename samples/{TestCpp => test-cpp}/Classes/BugsTest/Bug-1174.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/BugsTest/Bug-1174.h (100%) rename samples/{TestCpp => test-cpp}/Classes/BugsTest/Bug-350.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/BugsTest/Bug-350.h (100%) rename samples/{TestCpp => test-cpp}/Classes/BugsTest/Bug-422.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/BugsTest/Bug-422.h (100%) rename samples/{TestCpp => test-cpp}/Classes/BugsTest/Bug-458/Bug-458.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/BugsTest/Bug-458/Bug-458.h (100%) rename samples/{TestCpp => test-cpp}/Classes/BugsTest/Bug-458/QuestionContainerSprite.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/BugsTest/Bug-458/QuestionContainerSprite.h (100%) rename samples/{TestCpp => test-cpp}/Classes/BugsTest/Bug-624.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/BugsTest/Bug-624.h (100%) rename samples/{TestCpp => test-cpp}/Classes/BugsTest/Bug-886.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/BugsTest/Bug-886.h (100%) rename samples/{TestCpp => test-cpp}/Classes/BugsTest/Bug-899.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/BugsTest/Bug-899.h (100%) rename samples/{TestCpp => test-cpp}/Classes/BugsTest/Bug-914.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/BugsTest/Bug-914.h (100%) rename samples/{TestCpp => test-cpp}/Classes/BugsTest/BugsTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/BugsTest/BugsTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/ChipmunkTest/ChipmunkTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/ChipmunkTest/ChipmunkTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/ClickAndMoveTest/ClickAndMoveTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/ClickAndMoveTest/ClickAndMoveTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/ClippingNodeTest/ClippingNodeTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/ClippingNodeTest/ClippingNodeTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/CocosDenshionTest/CocosDenshionTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/CocosDenshionTest/CocosDenshionTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/ConfigurationTest/ConfigurationTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/ConfigurationTest/ConfigurationTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/ConsoleTest/ConsoleTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/ConsoleTest/ConsoleTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/CurlTest/CurlTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/CurlTest/CurlTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/CurrentLanguageTest/CurrentLanguageTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/CurrentLanguageTest/CurrentLanguageTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/DataVisitorTest/DataVisitorTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/DataVisitorTest/DataVisitorTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/DrawPrimitivesTest/DrawPrimitivesTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/DrawPrimitivesTest/DrawPrimitivesTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/EffectsAdvancedTest/EffectsAdvancedTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/EffectsAdvancedTest/EffectsAdvancedTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/EffectsTest/EffectsTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/EffectsTest/EffectsTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.h (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/CocoStudioComponentsTest/ComponentsTestScene.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/CocoStudioComponentsTest/ComponentsTestScene.h (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/CocoStudioComponentsTest/EnemyController.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/CocoStudioComponentsTest/EnemyController.h (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/CocoStudioComponentsTest/GameOverScene.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/CocoStudioComponentsTest/GameOverScene.h (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/CocoStudioComponentsTest/PlayerController.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/CocoStudioComponentsTest/PlayerController.h (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/CocoStudioComponentsTest/ProjectileController.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/CocoStudioComponentsTest/ProjectileController.h (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/CocoStudioComponentsTest/SceneController.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/CocoStudioComponentsTest/SceneController.h (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/CocoStudioGUITest/CocosGUIScene.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/CocoStudioGUITest/CocosGUIScene.h (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/CocoStudioGUITest/UILabelAtlasTest/UILabelAtlasTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/CocoStudioGUITest/UILabelAtlasTest/UILabelAtlasTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/CocoStudioGUITest/UILabelBMFontTest/UILabelBMFontTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/CocoStudioGUITest/UILabelBMFontTest/UILabelBMFontTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/CocoStudioGUITest/UILabelTest/UILabelTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/CocoStudioGUITest/UILabelTest/UILabelTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/CocoStudioGUITest/UIListViewTest/UIListViewTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/CocoStudioGUITest/UIListViewTest/UIListViewTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/CocoStudioGUITest/UIScene.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/CocoStudioGUITest/UIScene.h (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/CocoStudioGUITest/UISceneManager.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/CocoStudioGUITest/UISceneManager.h (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/CocoStudioGUITest/UISliderTest/UISliderTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/CocoStudioGUITest/UISliderTest/UISliderTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/EventDef.h (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/acts.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/acts.h (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/cons.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/cons.h (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsLayerLoader.h (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsTestLayer.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsTestLayer.h (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayer.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayer.h (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayerLoader.h (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/CocosBuilderTest/CocosBuilderTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/CocosBuilderTest/CocosBuilderTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayer.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayer.h (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayerLoader.h (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/CocosBuilderTest/LabelTest/LabelTestLayer.h (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/CocosBuilderTest/LabelTest/LabelTestLayerLoader.h (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayer.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayer.h (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayerLoader.h (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/CocosBuilderTest/ParticleSystemTest/ParticleSystemTestLayer.h (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/CocosBuilderTest/ParticleSystemTest/ParticleSystemTestLayerLoader.h (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/CocosBuilderTest/ScrollViewTest/ScrollViewTestLayer.h (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/CocosBuilderTest/ScrollViewTest/ScrollViewTestLayerLoader.h (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/CocosBuilderTest/SpriteTest/SpriteTestLayer.h (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/CocosBuilderTest/SpriteTest/SpriteTestLayerLoader.h (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayer.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayer.h (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayerLoader.h (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackLayerLoader.h (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackTestLayer.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackTestLayer.h (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/ControlExtensionTest/CCControlButtonTest/CCControlButtonTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/ControlExtensionTest/CCControlButtonTest/CCControlButtonTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/ControlExtensionTest/CCControlColourPicker/CCControlColourPickerTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/ControlExtensionTest/CCControlColourPicker/CCControlColourPickerTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/ControlExtensionTest/CCControlPotentiometerTest/CCControlPotentiometerTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/ControlExtensionTest/CCControlPotentiometerTest/CCControlPotentiometerTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/ControlExtensionTest/CCControlScene.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/ControlExtensionTest/CCControlScene.h (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/ControlExtensionTest/CCControlSceneManager.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/ControlExtensionTest/CCControlSceneManager.h (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/ControlExtensionTest/CCControlSliderTest/CCControlSliderTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/ControlExtensionTest/CCControlSliderTest/CCControlSliderTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/ControlExtensionTest/CCControlStepperTest/CCControlStepperTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/ControlExtensionTest/CCControlStepperTest/CCControlStepperTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/ControlExtensionTest/CCControlSwitchTest/CCControlSwitchTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/ControlExtensionTest/CCControlSwitchTest/CCControlSwitchTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/EditBoxTest/EditBoxTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/EditBoxTest/EditBoxTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/ExtensionsTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/ExtensionsTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/NetworkTest/HttpClientTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/NetworkTest/HttpClientTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/NetworkTest/SocketIOTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/NetworkTest/SocketIOTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/NetworkTest/WebSocketTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/NetworkTest/WebSocketTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/NotificationCenterTest/NotificationCenterTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/NotificationCenterTest/NotificationCenterTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/Scale9SpriteTest/Scale9SpriteTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/Scale9SpriteTest/Scale9SpriteTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/TableViewTest/CustomTableViewCell.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/TableViewTest/CustomTableViewCell.h (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/TableViewTest/TableViewTestScene.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/ExtensionsTest/TableViewTest/TableViewTestScene.h (100%) rename samples/{TestCpp => test-cpp}/Classes/FileUtilsTest/FileUtilsTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/FileUtilsTest/FileUtilsTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/FontTest/FontTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/FontTest/FontTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/InputTest/MouseTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/InputTest/MouseTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/IntervalTest/IntervalTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/IntervalTest/IntervalTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/KeyboardTest/KeyboardTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/KeyboardTest/KeyboardTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/KeypadTest/KeypadTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/KeypadTest/KeypadTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/LabelTest/LabelTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/LabelTest/LabelTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/LabelTest/LabelTestNew.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/LabelTest/LabelTestNew.h (100%) rename samples/{TestCpp => test-cpp}/Classes/LayerTest/LayerTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/LayerTest/LayerTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/MenuTest/MenuTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/MenuTest/MenuTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/MotionStreakTest/MotionStreakTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/MotionStreakTest/MotionStreakTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/MutiTouchTest/MutiTouchTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/MutiTouchTest/MutiTouchTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/NewEventDispatcherTest/NewEventDispatcherTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/NewEventDispatcherTest/NewEventDispatcherTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/NewRendererTest/NewRendererTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/NewRendererTest/NewRendererTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/NodeTest/NodeTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/NodeTest/NodeTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/ParallaxTest/ParallaxTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/ParallaxTest/ParallaxTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/ParticleTest/ParticleTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/ParticleTest/ParticleTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/PerformanceTest/PerformanceAllocTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/PerformanceTest/PerformanceAllocTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/PerformanceTest/PerformanceContainerTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/PerformanceTest/PerformanceContainerTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/PerformanceTest/PerformanceEventDispatcherTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/PerformanceTest/PerformanceEventDispatcherTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/PerformanceTest/PerformanceLabelTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/PerformanceTest/PerformanceLabelTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/PerformanceTest/PerformanceNodeChildrenTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/PerformanceTest/PerformanceNodeChildrenTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/PerformanceTest/PerformanceParticleTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/PerformanceTest/PerformanceParticleTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/PerformanceTest/PerformanceRendererTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/PerformanceTest/PerformanceRendererTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/PerformanceTest/PerformanceSpriteTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/PerformanceTest/PerformanceSpriteTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/PerformanceTest/PerformanceTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/PerformanceTest/PerformanceTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/PerformanceTest/PerformanceTextureTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/PerformanceTest/PerformanceTextureTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/PerformanceTest/PerformanceTouchesTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/PerformanceTest/PerformanceTouchesTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/PhysicsTest/PhysicsTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/PhysicsTest/PhysicsTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/ReleasePoolTest/ReleasePoolTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/ReleasePoolTest/ReleasePoolTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/RenderTextureTest/RenderTextureTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/RenderTextureTest/RenderTextureTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/RotateWorldTest/RotateWorldTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/RotateWorldTest/RotateWorldTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/SceneTest/SceneTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/SceneTest/SceneTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/SchedulerTest/SchedulerTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/SchedulerTest/SchedulerTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/ShaderTest/ShaderTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/ShaderTest/ShaderTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/ShaderTest/ShaderTest2.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/ShaderTest/ShaderTest2.h (100%) rename samples/{TestCpp => test-cpp}/Classes/SpineTest/SpineTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/SpineTest/SpineTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/SpriteTest/SpriteTest.cpp.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Classes/SpriteTest/SpriteTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/TextInputTest/TextInputTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/TextInputTest/TextInputTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/Texture2dTest/Texture2dTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/Texture2dTest/Texture2dTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/TextureCacheTest/TextureCacheTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/TextureCacheTest/TextureCacheTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/TexturePackerEncryptionTest/TextureAtlasEncryptionTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/TexturePackerEncryptionTest/TextureAtlasEncryptionTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/TileMapTest/TileMapTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/TileMapTest/TileMapTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/TouchesTest/Ball.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/TouchesTest/Ball.h (100%) rename samples/{TestCpp => test-cpp}/Classes/TouchesTest/Paddle.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/TouchesTest/Paddle.h (100%) rename samples/{TestCpp => test-cpp}/Classes/TouchesTest/TouchesTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/TouchesTest/TouchesTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/TransitionsTest/TransitionsTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/TransitionsTest/TransitionsTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/UnitTest/UnitTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/UnitTest/UnitTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/UserDefaultTest/UserDefaultTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/UserDefaultTest/UserDefaultTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/VisibleRect.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/VisibleRect.h (100%) rename samples/{TestCpp => test-cpp}/Classes/ZwoptexTest/ZwoptexTest.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/ZwoptexTest/ZwoptexTest.h (100%) rename samples/{TestCpp => test-cpp}/Classes/controller.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/controller.h (100%) rename samples/{TestCpp => test-cpp}/Classes/testBasic.cpp (100%) rename samples/{TestCpp => test-cpp}/Classes/testBasic.h (100%) rename samples/{TestCpp => test-cpp}/Classes/testResource.h (100%) rename samples/{TestCpp => test-cpp}/Classes/tests.h (100%) rename samples/{TestCpp => test-cpp}/Resources/.gitignore (100%) rename samples/{TestCpp => test-cpp}/Resources/Hello.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/Images/HelloWorld.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/Images/PlanetCute-1024x1024.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/Images/atlastest.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/Images/background1.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/Images/background2.jpg.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/Images/background2.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/Images/bugs/bug886.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/Images/grossini_dance_atlas-mono.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/Images/landscape-1024x1024.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/Images/noise.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/Images/spritesheet1.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/Images/stone.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/Images/test_1021x1024.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/Images/test_1021x1024_a8.pvr.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/Images/test_1021x1024_rgb888.pvr.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/Images/test_1021x1024_rgb888.pvr.gz.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/Images/test_1021x1024_rgba4444.pvr.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/Images/test_1021x1024_rgba4444.pvr.gz.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/Images/test_1021x1024_rgba8888.pvr.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/Images/test_1021x1024_rgba8888.pvr.gz.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/Misc/resources-hd/test4.txt (100%) rename samples/{TestCpp => test-cpp}/Resources/Misc/resources-ipad/test2.txt (100%) rename samples/{TestCpp => test-cpp}/Resources/Misc/resources-ipadhd/test1.txt (100%) rename samples/{TestCpp => test-cpp}/Resources/Misc/resources-iphone/test6.txt (100%) rename samples/{TestCpp => test-cpp}/Resources/Misc/resources-mac/test2.txt (100%) rename samples/{TestCpp => test-cpp}/Resources/Misc/resources-machd/test1.txt (100%) rename samples/{TestCpp => test-cpp}/Resources/Misc/resources-wide/test5.txt (100%) rename samples/{TestCpp => test-cpp}/Resources/Misc/resources-widehd/test3.txt (100%) rename samples/{TestCpp => test-cpp}/Resources/Misc/searchpath1/file1.txt (100%) rename samples/{TestCpp => test-cpp}/Resources/Misc/searchpath2/resources-ipad/file2.txt (100%) rename samples/{TestCpp => test-cpp}/Resources/Shaders/example_ColorBars.vsh (100%) rename samples/{TestCpp => test-cpp}/Resources/Shaders/example_Flower.vsh (100%) rename samples/{TestCpp => test-cpp}/Resources/Shaders/example_Heart.vsh (100%) rename samples/{TestCpp => test-cpp}/Resources/Shaders/example_Julia.vsh (100%) rename samples/{TestCpp => test-cpp}/Resources/Shaders/example_Mandelbrot.vsh (100%) rename samples/{TestCpp => test-cpp}/Resources/Shaders/example_Monjori.vsh (100%) rename samples/{TestCpp => test-cpp}/Resources/Shaders/example_Plasma.vsh (100%) rename samples/{TestCpp => test-cpp}/Resources/Shaders/example_Twist.vsh (100%) rename samples/{TestCpp => test-cpp}/Resources/TileMaps/hexa-tiles.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/TileMaps/map/slcj.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/TileMaps/ortho-test1.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/TileMaps/ortho-test1_bw.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/animations/grossini.plist.xml (100%) rename samples/{TestCpp => test-cpp}/Resources/armature/Cowboy.ExportJson.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/armature/Cowboy0.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/armature/Dragon.xml (100%) rename samples/{TestCpp => test-cpp}/Resources/armature/HeroAnimation.ExportJson.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/armature/cyborg.xml (100%) rename samples/{TestCpp => test-cpp}/Resources/armature/knight.xml (100%) rename samples/{TestCpp => test-cpp}/Resources/armature/robot.xml (100%) rename samples/{TestCpp => test-cpp}/Resources/armature/weapon.xml (100%) rename samples/{TestCpp => test-cpp}/Resources/background-music-aac.wav.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/background.mp3.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/ccb/flower.jpg.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/ccb/gem-0.wav.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/ccb/gem-1.wav.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/ccb/markerfelt24shadow.fnt.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/cocosgui/Hello.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/cocosgui/UITest/background.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/cocosgui/b11.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/cocosgui/bitmapFontTest2.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/cocosgui/examples/examples.json.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/cocosgui/gui_examples/map_1/map_pve.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/cocosgui/gui_examples/page_1/background.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/extensions/background.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/fonts/Courier New.ttf.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/fonts/Thonburi.ttf.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/fonts/ThonburiBold.ttf.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/fonts/arial-26-en-ru_0.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/fonts/arial-unicode-26.GlyphProject (100%) rename samples/{TestCpp => test-cpp}/Resources/fonts/arial-unicode-26.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/fonts/arial.ttf.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/fonts/bitmapFontChinese.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/fonts/bitmapFontTest.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/fonts/bitmapFontTest2.bmp.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/fonts/bitmapFontTest2.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/fonts/boundsTestFont.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/fonts/font-issue1343-hd.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/fonts/futura-48.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/fonts/helvetica-geneva-32.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/fonts/markerFelt.fnt.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/fonts/strings.xml (100%) rename samples/{TestCpp => test-cpp}/Resources/fonts/tahoma.ttf.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/fonts/wt021.ttf.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/hd/Images/background1.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/hd/Images/background2.jpg.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/hd/Images/background2.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/hd/armature/Cowboy0.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/hd/armature/Dragon.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/hd/armature/HeroAnimation0.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/hd/armature/weapon.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/hd/ccb/burst.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/hd/cocosgui/Hello.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/hd/cocosgui/UITest/background.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/hd/cocosgui/b11.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/hd/cocosgui/bitmapFontTest2.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/hd/cocosgui/examples/examples.json.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/hd/cocosgui/gui_examples/map_1/map_pve.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/hd/cocosgui/gui_examples/page_1/background.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/hd/extensions/background.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/hd/fonts/font-issue1343.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/hd/fonts/markerFelt.fnt.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/hd/fonts/markerFelt.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/hd/fonts/tuffy_bold_italic-charmap.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/hd/scenetest/ArmatureComponentTest/Images/startMenuBG.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/hd/scenetest/ArmatureComponentTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/hd/scenetest/ArmatureComponentTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/hd/scenetest/BackgroundComponentTest/Images/startMenuBG.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/hd/scenetest/BackgroundComponentTest/Misc/music_logo.mp3.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/hd/scenetest/BackgroundComponentTest/Misc/music_logo.wav.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/hd/scenetest/BackgroundComponentTest/startMenu/Fish_UI/starMenuButton01.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/hd/scenetest/BackgroundComponentTest/startMenu/Fish_UI/starMenuButton02.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/hd/scenetest/BackgroundComponentTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/hd/scenetest/EffectComponentTest/CowBoy/Cowboy.ExportJson.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/hd/scenetest/EffectComponentTest/CowBoy/Cowboy0.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/hd/scenetest/LoadSceneEdtiorFileTest/Images/startMenuBG.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/hd/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.mp3.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/hd/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.wav.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/hd/scenetest/LoadSceneEdtiorFileTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/hd/scenetest/LoadSceneEdtiorFileTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/hd/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/starMenuButton01.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/hd/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/starMenuButton02.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/hd/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/hd/scenetest/TriggerTest/Images/startMenuBG.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/hd/scenetest/TriggerTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/hd/scenetest/TriggerTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/hd/scenetest/UIComponentTest/Images/startMenuBG.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/hd/scenetest/UIComponentTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/hd/scenetest/UIComponentTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/hd/spine/goblins.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/hd/spine/spineboy.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/ipad/ccb/burst.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/ipad/extensions/background.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/scenetest/ArmatureComponentTest/Images/startMenuBG.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/scenetest/ArmatureComponentTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/scenetest/ArmatureComponentTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/scenetest/BackgroundComponentTest/Images/startMenuBG.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/scenetest/BackgroundComponentTest/Misc/music_logo.mp3.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/scenetest/BackgroundComponentTest/Misc/music_logo.wav.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/scenetest/BackgroundComponentTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/scenetest/EffectComponentTest/CowBoy/Cowboy.ExportJson.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/scenetest/EffectComponentTest/CowBoy/Cowboy0.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/scenetest/LoadSceneEdtiorFileTest/Images/startMenuBG.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.mp3.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.wav.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/scenetest/LoadSceneEdtiorFileTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/scenetest/LoadSceneEdtiorFileTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/scenetest/TriggerTest/Images/startMenuBG.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/scenetest/TriggerTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/scenetest/TriggerTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/scenetest/UIComponentTest/Images/startMenuBG.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/scenetest/UIComponentTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/scenetest/UIComponentTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/Resources/spine/goblins.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/proj.android/.classpath (100%) rename samples/{TestCpp => test-cpp}/proj.android/.externalToolBuilders/Javah_jni_builder.launch (100%) rename samples/{TestCpp => test-cpp}/proj.android/.project (100%) rename samples/{TestCpp => test-cpp}/proj.android/.settings/org.eclipse.cdt.codan.core.prefs (100%) rename samples/{TestCpp => test-cpp}/proj.android/AndroidManifest.xml (100%) rename samples/{TestCpp => test-cpp}/proj.android/README.md (100%) rename samples/{TestCpp => test-cpp}/proj.android/ant.properties (100%) rename samples/{TestCpp => test-cpp}/proj.android/build.xml (100%) rename samples/{TestCpp => test-cpp}/proj.android/jni/Android.mk (100%) rename samples/{TestCpp => test-cpp}/proj.android/jni/Application.mk (100%) rename samples/{TestCpp => test-cpp}/proj.android/jni/testcpp/main.cpp (100%) rename samples/{TestCpp => test-cpp}/proj.android/ndkgdb.sh (100%) rename samples/{TestCpp => test-cpp}/proj.android/proguard-project.txt (100%) rename samples/{TestCpp => test-cpp}/proj.android/project.properties (100%) rename samples/{TestCpp => test-cpp}/proj.android/res/values/strings.xml (100%) rename samples/{TestCpp => test-cpp}/proj.android/src/nojava.txt (100%) rename samples/{TestCpp => test-cpp}/proj.android/src/org/cocos2dx/testcpp/Cocos2dxActivity.java (100%) rename samples/{TestCpp => test-cpp}/proj.ios/Classes/RootViewController.h (100%) rename samples/{TestCpp => test-cpp}/proj.ios/Classes/RootViewController.mm (100%) rename samples/{TestCpp => test-cpp}/proj.ios/Classes/testsAppDelegate.h (100%) rename samples/{TestCpp => test-cpp}/proj.ios/Classes/testsAppDelegate.mm (100%) rename samples/{TestCpp => test-cpp}/proj.ios/Default-568h@2x.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/proj.ios/Default@2x.png.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/proj.ios/iphone_Prefix.pch (100%) rename samples/{TestCpp => test-cpp}/proj.ios/main.m (100%) rename samples/{TestCpp => test-cpp}/proj.linux/main.cpp (100%) rename samples/{TestCpp => test-cpp}/proj.mac/Icon.icns.REMOVED.git-id (100%) rename samples/{TestCpp => test-cpp}/proj.mac/Test_Prefix.pch (100%) rename samples/{TestCpp => test-cpp}/proj.mac/en.lproj/InfoPlist.strings (100%) rename samples/{TestCpp => test-cpp}/proj.mac/en.lproj/MainMenu.xib (100%) rename samples/{TestCpp => test-cpp}/proj.mac/main.cpp (100%) rename samples/{TestCpp => test-cpp}/proj.win32/TestCpp.vcxproj (100%) rename samples/{TestCpp => test-cpp}/proj.win32/TestCpp.vcxproj.filters (100%) rename samples/{TestCpp => test-cpp}/proj.win32/TestCpp.vcxproj.user (100%) rename samples/{TestCpp => test-cpp}/proj.win32/main.cpp (100%) rename samples/{TestCpp => test-cpp}/proj.win32/main.h (100%) rename samples/{TestJavascript => test-javascript}/Classes/AppDelegate.cpp (100%) rename samples/{TestJavascript => test-javascript}/Classes/AppDelegate.h (100%) rename samples/{TestJavascript => test-javascript}/proj.android/.classpath (100%) rename samples/{TestJavascript => test-javascript}/proj.android/.project (100%) rename samples/{TestJavascript => test-javascript}/proj.android/.settings/.jsdtscope (100%) rename samples/{TestJavascript => test-javascript}/proj.android/.settings/org.eclipse.cdt.codan.core.prefs (100%) rename samples/{TestJavascript => test-javascript}/proj.android/.settings/org.eclipse.wst.jsdt.ui.prefs (100%) rename samples/{TestJavascript => test-javascript}/proj.android/.settings/org.eclipse.wst.jsdt.ui.superType.container (100%) rename samples/{TestJavascript => test-javascript}/proj.android/.settings/org.eclipse.wst.jsdt.ui.superType.name (100%) rename samples/{TestJavascript => test-javascript}/proj.android/AndroidManifest.xml (100%) rename samples/{TestJavascript => test-javascript}/proj.android/README.md (100%) rename samples/{TestJavascript => test-javascript}/proj.android/ant.properties (100%) rename samples/{TestJavascript => test-javascript}/proj.android/build.xml (100%) rename samples/{TestJavascript => test-javascript}/proj.android/jni/Android.mk (100%) rename samples/{TestJavascript => test-javascript}/proj.android/jni/Application.mk (100%) rename samples/{TestJavascript => test-javascript}/proj.android/jni/testjavascript/main.cpp (100%) rename samples/{TestJavascript => test-javascript}/proj.android/ndkgdb.sh (100%) rename samples/{TestJavascript => test-javascript}/proj.android/proguard-project.txt (100%) rename samples/{TestJavascript => test-javascript}/proj.android/project.properties (100%) rename samples/{TestJavascript => test-javascript}/proj.android/res/values/strings.xml (100%) rename samples/{TestJavascript => test-javascript}/proj.android/src/org/cocos2dx/testjavascript/Cocos2dxActivity.java (100%) rename samples/{TestJavascript => test-javascript}/proj.ios/AppController.h (100%) rename samples/{TestJavascript => test-javascript}/proj.ios/AppController.mm (100%) rename samples/{TestJavascript => test-javascript}/proj.ios/Default-568h@2x.png.REMOVED.git-id (100%) rename samples/{TestJavascript => test-javascript}/proj.ios/Default@2x.png.REMOVED.git-id (100%) rename samples/{TestJavascript => test-javascript}/proj.ios/Prefix.pch (100%) rename samples/{TestJavascript => test-javascript}/proj.ios/RootViewController.h (100%) rename samples/{TestJavascript => test-javascript}/proj.ios/RootViewController.mm (100%) rename samples/{TestJavascript => test-javascript}/proj.ios/main.m (100%) rename samples/{TestJavascript => test-javascript}/proj.mac/Icon.icns.REMOVED.git-id (100%) rename samples/{TestJavascript => test-javascript}/proj.mac/Test_Prefix.pch (100%) rename samples/{TestJavascript => test-javascript}/proj.mac/en.lproj/InfoPlist.strings (100%) rename samples/{TestJavascript => test-javascript}/proj.mac/en.lproj/MainMenu.xib (100%) rename samples/{TestJavascript => test-javascript}/proj.mac/main.cpp (100%) rename samples/{TestJavascript => test-javascript}/proj.win32/TestJavascript.vcxproj (100%) rename samples/{TestJavascript => test-javascript}/proj.win32/TestJavascript.vcxproj.filters (100%) rename samples/{TestJavascript => test-javascript}/proj.win32/TestJavascript.vcxproj.user (100%) rename samples/{TestJavascript => test-javascript}/proj.win32/main.cpp (100%) rename samples/{TestJavascript => test-javascript}/proj.win32/main.h (100%) rename samples/{TestJavascript => test-javascript}/proj.win32/res/testjs.ico (100%) rename samples/{TestJavascript => test-javascript}/proj.win32/resource.h (100%) rename samples/{TestJavascript => test-javascript}/proj.win32/testjs.rc (100%) rename samples/{TestLua => test-lua}/.gitignore (100%) rename samples/{TestLua => test-lua}/CMakeLists.txt (100%) rename samples/{TestLua => test-lua}/Classes/AppDelegate.cpp (100%) rename samples/{TestLua => test-lua}/Classes/AppDelegate.h (100%) rename samples/{TestLua => test-lua}/Classes/lua_assetsmanager_test_sample.cpp (100%) rename samples/{TestLua => test-lua}/Classes/lua_assetsmanager_test_sample.h (100%) rename samples/{TestLua => test-lua}/Resources/cocosbuilderRes/ccb/flower.jpg.REMOVED.git-id (100%) rename samples/{TestLua => test-lua}/Resources/cocosbuilderRes/ccb/gem-0.wav.REMOVED.git-id (100%) rename samples/{TestLua => test-lua}/Resources/cocosbuilderRes/ccb/gem-1.wav.REMOVED.git-id (100%) rename samples/{TestLua => test-lua}/Resources/cocosbuilderRes/ccb/markerfelt24shadow.fnt.REMOVED.git-id (100%) rename samples/{TestLua => test-lua}/Resources/luaScript/AccelerometerTest/AccelerometerTest.lua (100%) rename samples/{TestLua => test-lua}/Resources/luaScript/ActionManagerTest/ActionManagerTest.lua (100%) rename samples/{TestLua => test-lua}/Resources/luaScript/ActionsEaseTest/ActionsEaseTest.lua (100%) rename samples/{TestLua => test-lua}/Resources/luaScript/ActionsProgressTest/ActionsProgressTest.lua (100%) rename samples/{TestLua => test-lua}/Resources/luaScript/ActionsTest/ActionsTest.lua (100%) rename samples/{TestLua => test-lua}/Resources/luaScript/AssetsManagerTest/AssetsManagerModule.lua (100%) rename samples/{TestLua => test-lua}/Resources/luaScript/AssetsManagerTest/AssetsManagerTest.lua (100%) rename samples/{TestLua => test-lua}/Resources/luaScript/BugsTest/BugsTest.lua (100%) rename samples/{TestLua => test-lua}/Resources/luaScript/ClickAndMoveTest/ClickAndMoveTest.lua (100%) rename samples/{TestLua => test-lua}/Resources/luaScript/CocoStudioTest/CocoStudioArmatureTest/CocoStudioArmatureTest.lua (100%) rename samples/{TestLua => test-lua}/Resources/luaScript/CocoStudioTest/CocoStudioGUITest/CocoStudioGUITest.lua.REMOVED.git-id (100%) rename samples/{TestLua => test-lua}/Resources/luaScript/CocoStudioTest/CocoStudioSceneTest/CocoStudioSceneTest.lua (100%) rename samples/{TestLua => test-lua}/Resources/luaScript/CocoStudioTest/CocoStudioSceneTest/TriggerCode/acts.lua (100%) rename samples/{TestLua => test-lua}/Resources/luaScript/CocoStudioTest/CocoStudioSceneTest/TriggerCode/cons.lua (100%) rename samples/{TestLua => test-lua}/Resources/luaScript/CocoStudioTest/CocoStudioSceneTest/TriggerCode/eventDef.lua (100%) rename samples/{TestLua => test-lua}/Resources/luaScript/CocoStudioTest/CocoStudioTest.lua (100%) rename samples/{TestLua => test-lua}/Resources/luaScript/CocosDenshionTest/CocosDenshionTest.lua (100%) rename samples/{TestLua => test-lua}/Resources/luaScript/CurrentLanguageTest/CurrentLanguageTest.lua (100%) rename samples/{TestLua => test-lua}/Resources/luaScript/DrawPrimitivesTest/DrawPrimitivesTest.lua (100%) rename samples/{TestLua => test-lua}/Resources/luaScript/EffectsAdvancedTest/EffectsAdvancedTest.lua (100%) rename samples/{TestLua => test-lua}/Resources/luaScript/EffectsTest/EffectsName.lua (100%) rename samples/{TestLua => test-lua}/Resources/luaScript/EffectsTest/EffectsTest.lua (100%) rename samples/{TestLua => test-lua}/Resources/luaScript/ExtensionTest/CocosBuilderTest.lua (100%) rename samples/{TestLua => test-lua}/Resources/luaScript/ExtensionTest/ExtensionTest.lua (100%) rename samples/{TestLua => test-lua}/Resources/luaScript/ExtensionTest/WebProxyTest.lua (100%) rename samples/{TestLua => test-lua}/Resources/luaScript/FontTest/FontTest.lua (100%) rename samples/{TestLua => test-lua}/Resources/luaScript/IntervalTest/IntervalTest.lua (100%) rename samples/{TestLua => test-lua}/Resources/luaScript/KeypadTest/KeypadTest.lua (100%) rename samples/{TestLua => test-lua}/Resources/luaScript/LabelTest/LabelTest.lua (100%) rename samples/{TestLua => test-lua}/Resources/luaScript/LabelTestNew/LabelTestNew.lua (100%) rename samples/{TestLua => test-lua}/Resources/luaScript/LayerTest/LayerTest.lua (100%) rename samples/{TestLua => test-lua}/Resources/luaScript/LuaBridgeTest/LuaBridgeTest.lua (100%) rename samples/{TestLua => test-lua}/Resources/luaScript/MenuTest/MenuTest.lua (100%) rename samples/{TestLua => test-lua}/Resources/luaScript/MotionStreakTest/MotionStreakTest.lua (100%) rename samples/{TestLua => test-lua}/Resources/luaScript/NewEventDispatcherTest/NewEventDispatcherTest.lua (100%) rename samples/{TestLua => test-lua}/Resources/luaScript/NodeTest/NodeTest.lua (100%) rename samples/{TestLua => test-lua}/Resources/luaScript/OpenGLTest/OpenGLTest.lua (100%) rename samples/{TestLua => test-lua}/Resources/luaScript/ParallaxTest/ParallaxTest.lua (100%) rename samples/{TestLua => test-lua}/Resources/luaScript/ParticleTest/ParticleTest.lua (100%) rename samples/{TestLua => test-lua}/Resources/luaScript/PerformanceTest/PerformanceSpriteTest.lua (100%) rename samples/{TestLua => test-lua}/Resources/luaScript/PerformanceTest/PerformanceTest.lua (100%) rename samples/{TestLua => test-lua}/Resources/luaScript/PhysicsTest/PhysicsTest.lua (100%) rename samples/{TestLua => test-lua}/Resources/luaScript/RenderTextureTest/RenderTextureTest.lua (100%) rename samples/{TestLua => test-lua}/Resources/luaScript/RotateWorldTest/RotateWorldTest.lua (100%) rename samples/{TestLua => test-lua}/Resources/luaScript/SceneTest/SceneTest.lua (100%) rename samples/{TestLua => test-lua}/Resources/luaScript/SpineTest/SpineTest.lua (100%) rename samples/{TestLua => test-lua}/Resources/luaScript/SpriteTest/SpriteTest.lua (100%) rename samples/{TestLua => test-lua}/Resources/luaScript/Texture2dTest/Texture2dTest.lua (100%) rename samples/{TestLua => test-lua}/Resources/luaScript/TileMapTest/TileMapTest.lua (100%) rename samples/{TestLua => test-lua}/Resources/luaScript/TouchesTest/Ball.lua (100%) rename samples/{TestLua => test-lua}/Resources/luaScript/TouchesTest/Paddle.lua (100%) rename samples/{TestLua => test-lua}/Resources/luaScript/TouchesTest/TouchesTest.lua (100%) rename samples/{TestLua => test-lua}/Resources/luaScript/TransitionsTest/TransitionsName.lua (100%) rename samples/{TestLua => test-lua}/Resources/luaScript/TransitionsTest/TransitionsTest.lua (100%) rename samples/{TestLua => test-lua}/Resources/luaScript/UserDefaultTest/UserDefaultTest.lua (100%) rename samples/{TestLua => test-lua}/Resources/luaScript/VisibleRect.lua (100%) rename samples/{TestLua => test-lua}/Resources/luaScript/XMLHttpRequestTest/XMLHttpRequestTest.lua (100%) rename samples/{TestLua => test-lua}/Resources/luaScript/ZwoptexTest/ZwoptexTest.lua (100%) rename samples/{TestLua => test-lua}/Resources/luaScript/controller.lua (100%) rename samples/{TestLua => test-lua}/Resources/luaScript/helper.lua (100%) rename samples/{TestLua => test-lua}/Resources/luaScript/mainMenu.lua (100%) rename samples/{TestLua => test-lua}/Resources/luaScript/testResource.lua (100%) rename samples/{TestLua => test-lua}/proj.android/.classpath (100%) rename samples/{TestLua => test-lua}/proj.android/.project (100%) rename samples/{TestLua => test-lua}/proj.android/AndroidManifest.xml (100%) rename samples/{TestLua => test-lua}/proj.android/ant.properties (100%) rename samples/{TestLua => test-lua}/proj.android/build.xml (100%) rename samples/{TestLua => test-lua}/proj.android/jni/Android.mk (100%) rename samples/{TestLua => test-lua}/proj.android/jni/Application.mk (100%) rename samples/{TestLua => test-lua}/proj.android/jni/testlua/main.cpp (100%) rename samples/{TestLua => test-lua}/proj.android/proguard-project.txt (100%) rename samples/{TestLua => test-lua}/proj.android/project.properties (100%) rename samples/{TestLua => test-lua}/proj.android/res/values/strings.xml (100%) rename samples/{TestLua => test-lua}/proj.android/src/com/cocos2dx/sample/LuaJavaBridgeTest/LuaJavaBridgeTest.java (100%) rename samples/{TestLua => test-lua}/proj.android/src/org/cocos2dx/testlua/Cocos2dxActivity.java (100%) rename samples/{TestLua => test-lua}/proj.ios/AppController.h (100%) rename samples/{TestLua => test-lua}/proj.ios/AppController.mm (100%) rename samples/{TestLua => test-lua}/proj.ios/Default-568h@2x.png.REMOVED.git-id (100%) rename samples/{TestLua => test-lua}/proj.ios/Default@2x.png.REMOVED.git-id (100%) rename samples/{TestLua => test-lua}/proj.ios/LuaObjectCBridgeTest.h (100%) rename samples/{TestLua => test-lua}/proj.ios/LuaObjectCBridgeTest.mm (100%) rename samples/{TestLua => test-lua}/proj.ios/RootViewController.h (100%) rename samples/{TestLua => test-lua}/proj.ios/RootViewController.mm (100%) rename samples/{TestLua => test-lua}/proj.ios/TestLua_Prefix.pch (100%) rename samples/{TestLua => test-lua}/proj.ios/main.m (100%) rename samples/{TestLua => test-lua}/proj.linux/main.cpp (100%) rename samples/{TestLua => test-lua}/proj.mac/Icon.icns.REMOVED.git-id (100%) rename samples/{TestLua => test-lua}/proj.mac/LuaObjectCBridgeTest.h (100%) rename samples/{TestLua => test-lua}/proj.mac/LuaObjectCBridgeTest.mm (100%) rename samples/{TestLua => test-lua}/proj.mac/TestLua_Prefix.pch (100%) rename samples/{TestLua => test-lua}/proj.mac/en.lproj/InfoPlist.strings (100%) rename samples/{TestLua => test-lua}/proj.mac/en.lproj/MainMenu.xib (100%) rename samples/{TestLua => test-lua}/proj.mac/main.cpp (100%) rename samples/{TestLua => test-lua}/proj.win32/TestLua.rc (100%) rename samples/{TestLua => test-lua}/proj.win32/TestLua.win32.vcxproj (100%) rename samples/{TestLua => test-lua}/proj.win32/TestLua.win32.vcxproj.filters (100%) rename samples/{TestLua => test-lua}/proj.win32/TestLua.win32.vcxproj.user (100%) rename samples/{TestLua => test-lua}/proj.win32/main.cpp (100%) rename samples/{TestLua => test-lua}/proj.win32/main.h (100%) rename samples/{TestLua => test-lua}/proj.win32/res/TestLua.ico (100%) rename samples/{TestLua => test-lua}/proj.win32/resource.h (100%) diff --git a/samples/TestCpp/.cproject b/samples/test-cpp/.cproject similarity index 100% rename from samples/TestCpp/.cproject rename to samples/test-cpp/.cproject diff --git a/samples/TestCpp/.externalToolBuilders/Javah_jni_builder.launch b/samples/test-cpp/.externalToolBuilders/Javah_jni_builder.launch similarity index 100% rename from samples/TestCpp/.externalToolBuilders/Javah_jni_builder.launch rename to samples/test-cpp/.externalToolBuilders/Javah_jni_builder.launch diff --git a/samples/TestCpp/Android.mk b/samples/test-cpp/Android.mk similarity index 100% rename from samples/TestCpp/Android.mk rename to samples/test-cpp/Android.mk diff --git a/samples/TestCpp/CMakeLists.txt b/samples/test-cpp/CMakeLists.txt similarity index 100% rename from samples/TestCpp/CMakeLists.txt rename to samples/test-cpp/CMakeLists.txt diff --git a/samples/TestCpp/Classes/AccelerometerTest/AccelerometerTest.cpp b/samples/test-cpp/Classes/AccelerometerTest/AccelerometerTest.cpp similarity index 100% rename from samples/TestCpp/Classes/AccelerometerTest/AccelerometerTest.cpp rename to samples/test-cpp/Classes/AccelerometerTest/AccelerometerTest.cpp diff --git a/samples/TestCpp/Classes/AccelerometerTest/AccelerometerTest.h b/samples/test-cpp/Classes/AccelerometerTest/AccelerometerTest.h similarity index 100% rename from samples/TestCpp/Classes/AccelerometerTest/AccelerometerTest.h rename to samples/test-cpp/Classes/AccelerometerTest/AccelerometerTest.h diff --git a/samples/TestCpp/Classes/ActionManagerTest/ActionManagerTest.cpp b/samples/test-cpp/Classes/ActionManagerTest/ActionManagerTest.cpp similarity index 100% rename from samples/TestCpp/Classes/ActionManagerTest/ActionManagerTest.cpp rename to samples/test-cpp/Classes/ActionManagerTest/ActionManagerTest.cpp diff --git a/samples/TestCpp/Classes/ActionManagerTest/ActionManagerTest.h b/samples/test-cpp/Classes/ActionManagerTest/ActionManagerTest.h similarity index 100% rename from samples/TestCpp/Classes/ActionManagerTest/ActionManagerTest.h rename to samples/test-cpp/Classes/ActionManagerTest/ActionManagerTest.h diff --git a/samples/TestCpp/Classes/ActionsEaseTest/ActionsEaseTest.cpp b/samples/test-cpp/Classes/ActionsEaseTest/ActionsEaseTest.cpp similarity index 100% rename from samples/TestCpp/Classes/ActionsEaseTest/ActionsEaseTest.cpp rename to samples/test-cpp/Classes/ActionsEaseTest/ActionsEaseTest.cpp diff --git a/samples/TestCpp/Classes/ActionsEaseTest/ActionsEaseTest.h b/samples/test-cpp/Classes/ActionsEaseTest/ActionsEaseTest.h similarity index 100% rename from samples/TestCpp/Classes/ActionsEaseTest/ActionsEaseTest.h rename to samples/test-cpp/Classes/ActionsEaseTest/ActionsEaseTest.h diff --git a/samples/TestCpp/Classes/ActionsProgressTest/ActionsProgressTest.cpp b/samples/test-cpp/Classes/ActionsProgressTest/ActionsProgressTest.cpp similarity index 100% rename from samples/TestCpp/Classes/ActionsProgressTest/ActionsProgressTest.cpp rename to samples/test-cpp/Classes/ActionsProgressTest/ActionsProgressTest.cpp diff --git a/samples/TestCpp/Classes/ActionsProgressTest/ActionsProgressTest.h b/samples/test-cpp/Classes/ActionsProgressTest/ActionsProgressTest.h similarity index 100% rename from samples/TestCpp/Classes/ActionsProgressTest/ActionsProgressTest.h rename to samples/test-cpp/Classes/ActionsProgressTest/ActionsProgressTest.h diff --git a/samples/TestCpp/Classes/ActionsTest/ActionsTest.cpp b/samples/test-cpp/Classes/ActionsTest/ActionsTest.cpp similarity index 100% rename from samples/TestCpp/Classes/ActionsTest/ActionsTest.cpp rename to samples/test-cpp/Classes/ActionsTest/ActionsTest.cpp diff --git a/samples/TestCpp/Classes/ActionsTest/ActionsTest.h b/samples/test-cpp/Classes/ActionsTest/ActionsTest.h similarity index 100% rename from samples/TestCpp/Classes/ActionsTest/ActionsTest.h rename to samples/test-cpp/Classes/ActionsTest/ActionsTest.h diff --git a/samples/TestCpp/Classes/AppDelegate.cpp b/samples/test-cpp/Classes/AppDelegate.cpp similarity index 100% rename from samples/TestCpp/Classes/AppDelegate.cpp rename to samples/test-cpp/Classes/AppDelegate.cpp diff --git a/samples/TestCpp/Classes/AppDelegate.h b/samples/test-cpp/Classes/AppDelegate.h similarity index 100% rename from samples/TestCpp/Classes/AppDelegate.h rename to samples/test-cpp/Classes/AppDelegate.h diff --git a/samples/TestCpp/Classes/BaseTest.cpp b/samples/test-cpp/Classes/BaseTest.cpp similarity index 100% rename from samples/TestCpp/Classes/BaseTest.cpp rename to samples/test-cpp/Classes/BaseTest.cpp diff --git a/samples/TestCpp/Classes/BaseTest.h b/samples/test-cpp/Classes/BaseTest.h similarity index 100% rename from samples/TestCpp/Classes/BaseTest.h rename to samples/test-cpp/Classes/BaseTest.h diff --git a/samples/TestCpp/Classes/Box2DTest/Box2dTest.cpp b/samples/test-cpp/Classes/Box2DTest/Box2dTest.cpp similarity index 100% rename from samples/TestCpp/Classes/Box2DTest/Box2dTest.cpp rename to samples/test-cpp/Classes/Box2DTest/Box2dTest.cpp diff --git a/samples/TestCpp/Classes/Box2DTest/Box2dTest.h b/samples/test-cpp/Classes/Box2DTest/Box2dTest.h similarity index 100% rename from samples/TestCpp/Classes/Box2DTest/Box2dTest.h rename to samples/test-cpp/Classes/Box2DTest/Box2dTest.h diff --git a/samples/TestCpp/Classes/Box2DTestBed/Box2dView.cpp b/samples/test-cpp/Classes/Box2DTestBed/Box2dView.cpp similarity index 100% rename from samples/TestCpp/Classes/Box2DTestBed/Box2dView.cpp rename to samples/test-cpp/Classes/Box2DTestBed/Box2dView.cpp diff --git a/samples/TestCpp/Classes/Box2DTestBed/Box2dView.h b/samples/test-cpp/Classes/Box2DTestBed/Box2dView.h similarity index 100% rename from samples/TestCpp/Classes/Box2DTestBed/Box2dView.h rename to samples/test-cpp/Classes/Box2DTestBed/Box2dView.h diff --git a/samples/TestCpp/Classes/Box2DTestBed/GLES-Render.cpp b/samples/test-cpp/Classes/Box2DTestBed/GLES-Render.cpp similarity index 100% rename from samples/TestCpp/Classes/Box2DTestBed/GLES-Render.cpp rename to samples/test-cpp/Classes/Box2DTestBed/GLES-Render.cpp diff --git a/samples/TestCpp/Classes/Box2DTestBed/GLES-Render.h b/samples/test-cpp/Classes/Box2DTestBed/GLES-Render.h similarity index 100% rename from samples/TestCpp/Classes/Box2DTestBed/GLES-Render.h rename to samples/test-cpp/Classes/Box2DTestBed/GLES-Render.h diff --git a/samples/TestCpp/Classes/Box2DTestBed/Test.cpp b/samples/test-cpp/Classes/Box2DTestBed/Test.cpp similarity index 100% rename from samples/TestCpp/Classes/Box2DTestBed/Test.cpp rename to samples/test-cpp/Classes/Box2DTestBed/Test.cpp diff --git a/samples/TestCpp/Classes/Box2DTestBed/Test.h b/samples/test-cpp/Classes/Box2DTestBed/Test.h similarity index 100% rename from samples/TestCpp/Classes/Box2DTestBed/Test.h rename to samples/test-cpp/Classes/Box2DTestBed/Test.h diff --git a/samples/TestCpp/Classes/Box2DTestBed/TestEntries.cpp b/samples/test-cpp/Classes/Box2DTestBed/TestEntries.cpp similarity index 100% rename from samples/TestCpp/Classes/Box2DTestBed/TestEntries.cpp rename to samples/test-cpp/Classes/Box2DTestBed/TestEntries.cpp diff --git a/samples/TestCpp/Classes/Box2DTestBed/Tests/AddPair.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/AddPair.h similarity index 100% rename from samples/TestCpp/Classes/Box2DTestBed/Tests/AddPair.h rename to samples/test-cpp/Classes/Box2DTestBed/Tests/AddPair.h diff --git a/samples/TestCpp/Classes/Box2DTestBed/Tests/ApplyForce.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/ApplyForce.h similarity index 100% rename from samples/TestCpp/Classes/Box2DTestBed/Tests/ApplyForce.h rename to samples/test-cpp/Classes/Box2DTestBed/Tests/ApplyForce.h diff --git a/samples/TestCpp/Classes/Box2DTestBed/Tests/BodyTypes.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/BodyTypes.h similarity index 100% rename from samples/TestCpp/Classes/Box2DTestBed/Tests/BodyTypes.h rename to samples/test-cpp/Classes/Box2DTestBed/Tests/BodyTypes.h diff --git a/samples/TestCpp/Classes/Box2DTestBed/Tests/Breakable.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/Breakable.h similarity index 100% rename from samples/TestCpp/Classes/Box2DTestBed/Tests/Breakable.h rename to samples/test-cpp/Classes/Box2DTestBed/Tests/Breakable.h diff --git a/samples/TestCpp/Classes/Box2DTestBed/Tests/Bridge.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/Bridge.h similarity index 100% rename from samples/TestCpp/Classes/Box2DTestBed/Tests/Bridge.h rename to samples/test-cpp/Classes/Box2DTestBed/Tests/Bridge.h diff --git a/samples/TestCpp/Classes/Box2DTestBed/Tests/BulletTest.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/BulletTest.h similarity index 100% rename from samples/TestCpp/Classes/Box2DTestBed/Tests/BulletTest.h rename to samples/test-cpp/Classes/Box2DTestBed/Tests/BulletTest.h diff --git a/samples/TestCpp/Classes/Box2DTestBed/Tests/Cantilever.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/Cantilever.h similarity index 100% rename from samples/TestCpp/Classes/Box2DTestBed/Tests/Cantilever.h rename to samples/test-cpp/Classes/Box2DTestBed/Tests/Cantilever.h diff --git a/samples/TestCpp/Classes/Box2DTestBed/Tests/Car.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/Car.h similarity index 100% rename from samples/TestCpp/Classes/Box2DTestBed/Tests/Car.h rename to samples/test-cpp/Classes/Box2DTestBed/Tests/Car.h diff --git a/samples/TestCpp/Classes/Box2DTestBed/Tests/Chain.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/Chain.h similarity index 100% rename from samples/TestCpp/Classes/Box2DTestBed/Tests/Chain.h rename to samples/test-cpp/Classes/Box2DTestBed/Tests/Chain.h diff --git a/samples/TestCpp/Classes/Box2DTestBed/Tests/CharacterCollision.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/CharacterCollision.h similarity index 100% rename from samples/TestCpp/Classes/Box2DTestBed/Tests/CharacterCollision.h rename to samples/test-cpp/Classes/Box2DTestBed/Tests/CharacterCollision.h diff --git a/samples/TestCpp/Classes/Box2DTestBed/Tests/CollisionFiltering.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/CollisionFiltering.h similarity index 100% rename from samples/TestCpp/Classes/Box2DTestBed/Tests/CollisionFiltering.h rename to samples/test-cpp/Classes/Box2DTestBed/Tests/CollisionFiltering.h diff --git a/samples/TestCpp/Classes/Box2DTestBed/Tests/CollisionProcessing.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/CollisionProcessing.h similarity index 100% rename from samples/TestCpp/Classes/Box2DTestBed/Tests/CollisionProcessing.h rename to samples/test-cpp/Classes/Box2DTestBed/Tests/CollisionProcessing.h diff --git a/samples/TestCpp/Classes/Box2DTestBed/Tests/CompoundShapes.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/CompoundShapes.h similarity index 100% rename from samples/TestCpp/Classes/Box2DTestBed/Tests/CompoundShapes.h rename to samples/test-cpp/Classes/Box2DTestBed/Tests/CompoundShapes.h diff --git a/samples/TestCpp/Classes/Box2DTestBed/Tests/Confined.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/Confined.h similarity index 100% rename from samples/TestCpp/Classes/Box2DTestBed/Tests/Confined.h rename to samples/test-cpp/Classes/Box2DTestBed/Tests/Confined.h diff --git a/samples/TestCpp/Classes/Box2DTestBed/Tests/ContinuousTest.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/ContinuousTest.h similarity index 100% rename from samples/TestCpp/Classes/Box2DTestBed/Tests/ContinuousTest.h rename to samples/test-cpp/Classes/Box2DTestBed/Tests/ContinuousTest.h diff --git a/samples/TestCpp/Classes/Box2DTestBed/Tests/ConvexHull.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/ConvexHull.h similarity index 100% rename from samples/TestCpp/Classes/Box2DTestBed/Tests/ConvexHull.h rename to samples/test-cpp/Classes/Box2DTestBed/Tests/ConvexHull.h diff --git a/samples/TestCpp/Classes/Box2DTestBed/Tests/ConveyorBelt.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/ConveyorBelt.h similarity index 100% rename from samples/TestCpp/Classes/Box2DTestBed/Tests/ConveyorBelt.h rename to samples/test-cpp/Classes/Box2DTestBed/Tests/ConveyorBelt.h diff --git a/samples/TestCpp/Classes/Box2DTestBed/Tests/DistanceTest.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/DistanceTest.h similarity index 100% rename from samples/TestCpp/Classes/Box2DTestBed/Tests/DistanceTest.h rename to samples/test-cpp/Classes/Box2DTestBed/Tests/DistanceTest.h diff --git a/samples/TestCpp/Classes/Box2DTestBed/Tests/Dominos.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/Dominos.h similarity index 100% rename from samples/TestCpp/Classes/Box2DTestBed/Tests/Dominos.h rename to samples/test-cpp/Classes/Box2DTestBed/Tests/Dominos.h diff --git a/samples/TestCpp/Classes/Box2DTestBed/Tests/DumpShell.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/DumpShell.h similarity index 100% rename from samples/TestCpp/Classes/Box2DTestBed/Tests/DumpShell.h rename to samples/test-cpp/Classes/Box2DTestBed/Tests/DumpShell.h diff --git a/samples/TestCpp/Classes/Box2DTestBed/Tests/DynamicTreeTest.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/DynamicTreeTest.h similarity index 100% rename from samples/TestCpp/Classes/Box2DTestBed/Tests/DynamicTreeTest.h rename to samples/test-cpp/Classes/Box2DTestBed/Tests/DynamicTreeTest.h diff --git a/samples/TestCpp/Classes/Box2DTestBed/Tests/EdgeShapes.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/EdgeShapes.h similarity index 100% rename from samples/TestCpp/Classes/Box2DTestBed/Tests/EdgeShapes.h rename to samples/test-cpp/Classes/Box2DTestBed/Tests/EdgeShapes.h diff --git a/samples/TestCpp/Classes/Box2DTestBed/Tests/EdgeTest.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/EdgeTest.h similarity index 100% rename from samples/TestCpp/Classes/Box2DTestBed/Tests/EdgeTest.h rename to samples/test-cpp/Classes/Box2DTestBed/Tests/EdgeTest.h diff --git a/samples/TestCpp/Classes/Box2DTestBed/Tests/Gears.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/Gears.h similarity index 100% rename from samples/TestCpp/Classes/Box2DTestBed/Tests/Gears.h rename to samples/test-cpp/Classes/Box2DTestBed/Tests/Gears.h diff --git a/samples/TestCpp/Classes/Box2DTestBed/Tests/Mobile.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/Mobile.h similarity index 100% rename from samples/TestCpp/Classes/Box2DTestBed/Tests/Mobile.h rename to samples/test-cpp/Classes/Box2DTestBed/Tests/Mobile.h diff --git a/samples/TestCpp/Classes/Box2DTestBed/Tests/MobileBalanced.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/MobileBalanced.h similarity index 100% rename from samples/TestCpp/Classes/Box2DTestBed/Tests/MobileBalanced.h rename to samples/test-cpp/Classes/Box2DTestBed/Tests/MobileBalanced.h diff --git a/samples/TestCpp/Classes/Box2DTestBed/Tests/MotorJoint.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/MotorJoint.h similarity index 100% rename from samples/TestCpp/Classes/Box2DTestBed/Tests/MotorJoint.h rename to samples/test-cpp/Classes/Box2DTestBed/Tests/MotorJoint.h diff --git a/samples/TestCpp/Classes/Box2DTestBed/Tests/OneSidedPlatform.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/OneSidedPlatform.h similarity index 100% rename from samples/TestCpp/Classes/Box2DTestBed/Tests/OneSidedPlatform.h rename to samples/test-cpp/Classes/Box2DTestBed/Tests/OneSidedPlatform.h diff --git a/samples/TestCpp/Classes/Box2DTestBed/Tests/Pinball.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/Pinball.h similarity index 100% rename from samples/TestCpp/Classes/Box2DTestBed/Tests/Pinball.h rename to samples/test-cpp/Classes/Box2DTestBed/Tests/Pinball.h diff --git a/samples/TestCpp/Classes/Box2DTestBed/Tests/PolyCollision.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/PolyCollision.h similarity index 100% rename from samples/TestCpp/Classes/Box2DTestBed/Tests/PolyCollision.h rename to samples/test-cpp/Classes/Box2DTestBed/Tests/PolyCollision.h diff --git a/samples/TestCpp/Classes/Box2DTestBed/Tests/PolyShapes.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/PolyShapes.h similarity index 100% rename from samples/TestCpp/Classes/Box2DTestBed/Tests/PolyShapes.h rename to samples/test-cpp/Classes/Box2DTestBed/Tests/PolyShapes.h diff --git a/samples/TestCpp/Classes/Box2DTestBed/Tests/Prismatic.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/Prismatic.h similarity index 100% rename from samples/TestCpp/Classes/Box2DTestBed/Tests/Prismatic.h rename to samples/test-cpp/Classes/Box2DTestBed/Tests/Prismatic.h diff --git a/samples/TestCpp/Classes/Box2DTestBed/Tests/Pulleys.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/Pulleys.h similarity index 100% rename from samples/TestCpp/Classes/Box2DTestBed/Tests/Pulleys.h rename to samples/test-cpp/Classes/Box2DTestBed/Tests/Pulleys.h diff --git a/samples/TestCpp/Classes/Box2DTestBed/Tests/Pyramid.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/Pyramid.h similarity index 100% rename from samples/TestCpp/Classes/Box2DTestBed/Tests/Pyramid.h rename to samples/test-cpp/Classes/Box2DTestBed/Tests/Pyramid.h diff --git a/samples/TestCpp/Classes/Box2DTestBed/Tests/RayCast.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/RayCast.h similarity index 100% rename from samples/TestCpp/Classes/Box2DTestBed/Tests/RayCast.h rename to samples/test-cpp/Classes/Box2DTestBed/Tests/RayCast.h diff --git a/samples/TestCpp/Classes/Box2DTestBed/Tests/Revolute.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/Revolute.h similarity index 100% rename from samples/TestCpp/Classes/Box2DTestBed/Tests/Revolute.h rename to samples/test-cpp/Classes/Box2DTestBed/Tests/Revolute.h diff --git a/samples/TestCpp/Classes/Box2DTestBed/Tests/Rope.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/Rope.h similarity index 100% rename from samples/TestCpp/Classes/Box2DTestBed/Tests/Rope.h rename to samples/test-cpp/Classes/Box2DTestBed/Tests/Rope.h diff --git a/samples/TestCpp/Classes/Box2DTestBed/Tests/RopeJoint.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/RopeJoint.h similarity index 100% rename from samples/TestCpp/Classes/Box2DTestBed/Tests/RopeJoint.h rename to samples/test-cpp/Classes/Box2DTestBed/Tests/RopeJoint.h diff --git a/samples/TestCpp/Classes/Box2DTestBed/Tests/SensorTest.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/SensorTest.h similarity index 100% rename from samples/TestCpp/Classes/Box2DTestBed/Tests/SensorTest.h rename to samples/test-cpp/Classes/Box2DTestBed/Tests/SensorTest.h diff --git a/samples/TestCpp/Classes/Box2DTestBed/Tests/ShapeEditing.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/ShapeEditing.h similarity index 100% rename from samples/TestCpp/Classes/Box2DTestBed/Tests/ShapeEditing.h rename to samples/test-cpp/Classes/Box2DTestBed/Tests/ShapeEditing.h diff --git a/samples/TestCpp/Classes/Box2DTestBed/Tests/SliderCrank.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/SliderCrank.h similarity index 100% rename from samples/TestCpp/Classes/Box2DTestBed/Tests/SliderCrank.h rename to samples/test-cpp/Classes/Box2DTestBed/Tests/SliderCrank.h diff --git a/samples/TestCpp/Classes/Box2DTestBed/Tests/SphereStack.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/SphereStack.h similarity index 100% rename from samples/TestCpp/Classes/Box2DTestBed/Tests/SphereStack.h rename to samples/test-cpp/Classes/Box2DTestBed/Tests/SphereStack.h diff --git a/samples/TestCpp/Classes/Box2DTestBed/Tests/TheoJansen.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/TheoJansen.h similarity index 100% rename from samples/TestCpp/Classes/Box2DTestBed/Tests/TheoJansen.h rename to samples/test-cpp/Classes/Box2DTestBed/Tests/TheoJansen.h diff --git a/samples/TestCpp/Classes/Box2DTestBed/Tests/Tiles.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/Tiles.h similarity index 100% rename from samples/TestCpp/Classes/Box2DTestBed/Tests/Tiles.h rename to samples/test-cpp/Classes/Box2DTestBed/Tests/Tiles.h diff --git a/samples/TestCpp/Classes/Box2DTestBed/Tests/TimeOfImpact.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/TimeOfImpact.h similarity index 100% rename from samples/TestCpp/Classes/Box2DTestBed/Tests/TimeOfImpact.h rename to samples/test-cpp/Classes/Box2DTestBed/Tests/TimeOfImpact.h diff --git a/samples/TestCpp/Classes/Box2DTestBed/Tests/Tumbler.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/Tumbler.h similarity index 100% rename from samples/TestCpp/Classes/Box2DTestBed/Tests/Tumbler.h rename to samples/test-cpp/Classes/Box2DTestBed/Tests/Tumbler.h diff --git a/samples/TestCpp/Classes/Box2DTestBed/Tests/VaryingFriction.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/VaryingFriction.h similarity index 100% rename from samples/TestCpp/Classes/Box2DTestBed/Tests/VaryingFriction.h rename to samples/test-cpp/Classes/Box2DTestBed/Tests/VaryingFriction.h diff --git a/samples/TestCpp/Classes/Box2DTestBed/Tests/VaryingRestitution.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/VaryingRestitution.h similarity index 100% rename from samples/TestCpp/Classes/Box2DTestBed/Tests/VaryingRestitution.h rename to samples/test-cpp/Classes/Box2DTestBed/Tests/VaryingRestitution.h diff --git a/samples/TestCpp/Classes/Box2DTestBed/Tests/VerticalStack.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/VerticalStack.h similarity index 100% rename from samples/TestCpp/Classes/Box2DTestBed/Tests/VerticalStack.h rename to samples/test-cpp/Classes/Box2DTestBed/Tests/VerticalStack.h diff --git a/samples/TestCpp/Classes/Box2DTestBed/Tests/Web.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/Web.h similarity index 100% rename from samples/TestCpp/Classes/Box2DTestBed/Tests/Web.h rename to samples/test-cpp/Classes/Box2DTestBed/Tests/Web.h diff --git a/samples/TestCpp/Classes/BugsTest/Bug-1159.cpp b/samples/test-cpp/Classes/BugsTest/Bug-1159.cpp similarity index 100% rename from samples/TestCpp/Classes/BugsTest/Bug-1159.cpp rename to samples/test-cpp/Classes/BugsTest/Bug-1159.cpp diff --git a/samples/TestCpp/Classes/BugsTest/Bug-1159.h b/samples/test-cpp/Classes/BugsTest/Bug-1159.h similarity index 100% rename from samples/TestCpp/Classes/BugsTest/Bug-1159.h rename to samples/test-cpp/Classes/BugsTest/Bug-1159.h diff --git a/samples/TestCpp/Classes/BugsTest/Bug-1174.cpp b/samples/test-cpp/Classes/BugsTest/Bug-1174.cpp similarity index 100% rename from samples/TestCpp/Classes/BugsTest/Bug-1174.cpp rename to samples/test-cpp/Classes/BugsTest/Bug-1174.cpp diff --git a/samples/TestCpp/Classes/BugsTest/Bug-1174.h b/samples/test-cpp/Classes/BugsTest/Bug-1174.h similarity index 100% rename from samples/TestCpp/Classes/BugsTest/Bug-1174.h rename to samples/test-cpp/Classes/BugsTest/Bug-1174.h diff --git a/samples/TestCpp/Classes/BugsTest/Bug-350.cpp b/samples/test-cpp/Classes/BugsTest/Bug-350.cpp similarity index 100% rename from samples/TestCpp/Classes/BugsTest/Bug-350.cpp rename to samples/test-cpp/Classes/BugsTest/Bug-350.cpp diff --git a/samples/TestCpp/Classes/BugsTest/Bug-350.h b/samples/test-cpp/Classes/BugsTest/Bug-350.h similarity index 100% rename from samples/TestCpp/Classes/BugsTest/Bug-350.h rename to samples/test-cpp/Classes/BugsTest/Bug-350.h diff --git a/samples/TestCpp/Classes/BugsTest/Bug-422.cpp b/samples/test-cpp/Classes/BugsTest/Bug-422.cpp similarity index 100% rename from samples/TestCpp/Classes/BugsTest/Bug-422.cpp rename to samples/test-cpp/Classes/BugsTest/Bug-422.cpp diff --git a/samples/TestCpp/Classes/BugsTest/Bug-422.h b/samples/test-cpp/Classes/BugsTest/Bug-422.h similarity index 100% rename from samples/TestCpp/Classes/BugsTest/Bug-422.h rename to samples/test-cpp/Classes/BugsTest/Bug-422.h diff --git a/samples/TestCpp/Classes/BugsTest/Bug-458/Bug-458.cpp b/samples/test-cpp/Classes/BugsTest/Bug-458/Bug-458.cpp similarity index 100% rename from samples/TestCpp/Classes/BugsTest/Bug-458/Bug-458.cpp rename to samples/test-cpp/Classes/BugsTest/Bug-458/Bug-458.cpp diff --git a/samples/TestCpp/Classes/BugsTest/Bug-458/Bug-458.h b/samples/test-cpp/Classes/BugsTest/Bug-458/Bug-458.h similarity index 100% rename from samples/TestCpp/Classes/BugsTest/Bug-458/Bug-458.h rename to samples/test-cpp/Classes/BugsTest/Bug-458/Bug-458.h diff --git a/samples/TestCpp/Classes/BugsTest/Bug-458/QuestionContainerSprite.cpp b/samples/test-cpp/Classes/BugsTest/Bug-458/QuestionContainerSprite.cpp similarity index 100% rename from samples/TestCpp/Classes/BugsTest/Bug-458/QuestionContainerSprite.cpp rename to samples/test-cpp/Classes/BugsTest/Bug-458/QuestionContainerSprite.cpp diff --git a/samples/TestCpp/Classes/BugsTest/Bug-458/QuestionContainerSprite.h b/samples/test-cpp/Classes/BugsTest/Bug-458/QuestionContainerSprite.h similarity index 100% rename from samples/TestCpp/Classes/BugsTest/Bug-458/QuestionContainerSprite.h rename to samples/test-cpp/Classes/BugsTest/Bug-458/QuestionContainerSprite.h diff --git a/samples/TestCpp/Classes/BugsTest/Bug-624.cpp b/samples/test-cpp/Classes/BugsTest/Bug-624.cpp similarity index 100% rename from samples/TestCpp/Classes/BugsTest/Bug-624.cpp rename to samples/test-cpp/Classes/BugsTest/Bug-624.cpp diff --git a/samples/TestCpp/Classes/BugsTest/Bug-624.h b/samples/test-cpp/Classes/BugsTest/Bug-624.h similarity index 100% rename from samples/TestCpp/Classes/BugsTest/Bug-624.h rename to samples/test-cpp/Classes/BugsTest/Bug-624.h diff --git a/samples/TestCpp/Classes/BugsTest/Bug-886.cpp b/samples/test-cpp/Classes/BugsTest/Bug-886.cpp similarity index 100% rename from samples/TestCpp/Classes/BugsTest/Bug-886.cpp rename to samples/test-cpp/Classes/BugsTest/Bug-886.cpp diff --git a/samples/TestCpp/Classes/BugsTest/Bug-886.h b/samples/test-cpp/Classes/BugsTest/Bug-886.h similarity index 100% rename from samples/TestCpp/Classes/BugsTest/Bug-886.h rename to samples/test-cpp/Classes/BugsTest/Bug-886.h diff --git a/samples/TestCpp/Classes/BugsTest/Bug-899.cpp b/samples/test-cpp/Classes/BugsTest/Bug-899.cpp similarity index 100% rename from samples/TestCpp/Classes/BugsTest/Bug-899.cpp rename to samples/test-cpp/Classes/BugsTest/Bug-899.cpp diff --git a/samples/TestCpp/Classes/BugsTest/Bug-899.h b/samples/test-cpp/Classes/BugsTest/Bug-899.h similarity index 100% rename from samples/TestCpp/Classes/BugsTest/Bug-899.h rename to samples/test-cpp/Classes/BugsTest/Bug-899.h diff --git a/samples/TestCpp/Classes/BugsTest/Bug-914.cpp b/samples/test-cpp/Classes/BugsTest/Bug-914.cpp similarity index 100% rename from samples/TestCpp/Classes/BugsTest/Bug-914.cpp rename to samples/test-cpp/Classes/BugsTest/Bug-914.cpp diff --git a/samples/TestCpp/Classes/BugsTest/Bug-914.h b/samples/test-cpp/Classes/BugsTest/Bug-914.h similarity index 100% rename from samples/TestCpp/Classes/BugsTest/Bug-914.h rename to samples/test-cpp/Classes/BugsTest/Bug-914.h diff --git a/samples/TestCpp/Classes/BugsTest/BugsTest.cpp b/samples/test-cpp/Classes/BugsTest/BugsTest.cpp similarity index 100% rename from samples/TestCpp/Classes/BugsTest/BugsTest.cpp rename to samples/test-cpp/Classes/BugsTest/BugsTest.cpp diff --git a/samples/TestCpp/Classes/BugsTest/BugsTest.h b/samples/test-cpp/Classes/BugsTest/BugsTest.h similarity index 100% rename from samples/TestCpp/Classes/BugsTest/BugsTest.h rename to samples/test-cpp/Classes/BugsTest/BugsTest.h diff --git a/samples/TestCpp/Classes/ChipmunkTest/ChipmunkTest.cpp b/samples/test-cpp/Classes/ChipmunkTest/ChipmunkTest.cpp similarity index 100% rename from samples/TestCpp/Classes/ChipmunkTest/ChipmunkTest.cpp rename to samples/test-cpp/Classes/ChipmunkTest/ChipmunkTest.cpp diff --git a/samples/TestCpp/Classes/ChipmunkTest/ChipmunkTest.h b/samples/test-cpp/Classes/ChipmunkTest/ChipmunkTest.h similarity index 100% rename from samples/TestCpp/Classes/ChipmunkTest/ChipmunkTest.h rename to samples/test-cpp/Classes/ChipmunkTest/ChipmunkTest.h diff --git a/samples/TestCpp/Classes/ClickAndMoveTest/ClickAndMoveTest.cpp b/samples/test-cpp/Classes/ClickAndMoveTest/ClickAndMoveTest.cpp similarity index 100% rename from samples/TestCpp/Classes/ClickAndMoveTest/ClickAndMoveTest.cpp rename to samples/test-cpp/Classes/ClickAndMoveTest/ClickAndMoveTest.cpp diff --git a/samples/TestCpp/Classes/ClickAndMoveTest/ClickAndMoveTest.h b/samples/test-cpp/Classes/ClickAndMoveTest/ClickAndMoveTest.h similarity index 100% rename from samples/TestCpp/Classes/ClickAndMoveTest/ClickAndMoveTest.h rename to samples/test-cpp/Classes/ClickAndMoveTest/ClickAndMoveTest.h diff --git a/samples/TestCpp/Classes/ClippingNodeTest/ClippingNodeTest.cpp b/samples/test-cpp/Classes/ClippingNodeTest/ClippingNodeTest.cpp similarity index 100% rename from samples/TestCpp/Classes/ClippingNodeTest/ClippingNodeTest.cpp rename to samples/test-cpp/Classes/ClippingNodeTest/ClippingNodeTest.cpp diff --git a/samples/TestCpp/Classes/ClippingNodeTest/ClippingNodeTest.h b/samples/test-cpp/Classes/ClippingNodeTest/ClippingNodeTest.h similarity index 100% rename from samples/TestCpp/Classes/ClippingNodeTest/ClippingNodeTest.h rename to samples/test-cpp/Classes/ClippingNodeTest/ClippingNodeTest.h diff --git a/samples/TestCpp/Classes/CocosDenshionTest/CocosDenshionTest.cpp b/samples/test-cpp/Classes/CocosDenshionTest/CocosDenshionTest.cpp similarity index 100% rename from samples/TestCpp/Classes/CocosDenshionTest/CocosDenshionTest.cpp rename to samples/test-cpp/Classes/CocosDenshionTest/CocosDenshionTest.cpp diff --git a/samples/TestCpp/Classes/CocosDenshionTest/CocosDenshionTest.h b/samples/test-cpp/Classes/CocosDenshionTest/CocosDenshionTest.h similarity index 100% rename from samples/TestCpp/Classes/CocosDenshionTest/CocosDenshionTest.h rename to samples/test-cpp/Classes/CocosDenshionTest/CocosDenshionTest.h diff --git a/samples/TestCpp/Classes/ConfigurationTest/ConfigurationTest.cpp b/samples/test-cpp/Classes/ConfigurationTest/ConfigurationTest.cpp similarity index 100% rename from samples/TestCpp/Classes/ConfigurationTest/ConfigurationTest.cpp rename to samples/test-cpp/Classes/ConfigurationTest/ConfigurationTest.cpp diff --git a/samples/TestCpp/Classes/ConfigurationTest/ConfigurationTest.h b/samples/test-cpp/Classes/ConfigurationTest/ConfigurationTest.h similarity index 100% rename from samples/TestCpp/Classes/ConfigurationTest/ConfigurationTest.h rename to samples/test-cpp/Classes/ConfigurationTest/ConfigurationTest.h diff --git a/samples/TestCpp/Classes/ConsoleTest/ConsoleTest.cpp b/samples/test-cpp/Classes/ConsoleTest/ConsoleTest.cpp similarity index 100% rename from samples/TestCpp/Classes/ConsoleTest/ConsoleTest.cpp rename to samples/test-cpp/Classes/ConsoleTest/ConsoleTest.cpp diff --git a/samples/TestCpp/Classes/ConsoleTest/ConsoleTest.h b/samples/test-cpp/Classes/ConsoleTest/ConsoleTest.h similarity index 100% rename from samples/TestCpp/Classes/ConsoleTest/ConsoleTest.h rename to samples/test-cpp/Classes/ConsoleTest/ConsoleTest.h diff --git a/samples/TestCpp/Classes/CurlTest/CurlTest.cpp b/samples/test-cpp/Classes/CurlTest/CurlTest.cpp similarity index 100% rename from samples/TestCpp/Classes/CurlTest/CurlTest.cpp rename to samples/test-cpp/Classes/CurlTest/CurlTest.cpp diff --git a/samples/TestCpp/Classes/CurlTest/CurlTest.h b/samples/test-cpp/Classes/CurlTest/CurlTest.h similarity index 100% rename from samples/TestCpp/Classes/CurlTest/CurlTest.h rename to samples/test-cpp/Classes/CurlTest/CurlTest.h diff --git a/samples/TestCpp/Classes/CurrentLanguageTest/CurrentLanguageTest.cpp b/samples/test-cpp/Classes/CurrentLanguageTest/CurrentLanguageTest.cpp similarity index 100% rename from samples/TestCpp/Classes/CurrentLanguageTest/CurrentLanguageTest.cpp rename to samples/test-cpp/Classes/CurrentLanguageTest/CurrentLanguageTest.cpp diff --git a/samples/TestCpp/Classes/CurrentLanguageTest/CurrentLanguageTest.h b/samples/test-cpp/Classes/CurrentLanguageTest/CurrentLanguageTest.h similarity index 100% rename from samples/TestCpp/Classes/CurrentLanguageTest/CurrentLanguageTest.h rename to samples/test-cpp/Classes/CurrentLanguageTest/CurrentLanguageTest.h diff --git a/samples/TestCpp/Classes/DataVisitorTest/DataVisitorTest.cpp b/samples/test-cpp/Classes/DataVisitorTest/DataVisitorTest.cpp similarity index 100% rename from samples/TestCpp/Classes/DataVisitorTest/DataVisitorTest.cpp rename to samples/test-cpp/Classes/DataVisitorTest/DataVisitorTest.cpp diff --git a/samples/TestCpp/Classes/DataVisitorTest/DataVisitorTest.h b/samples/test-cpp/Classes/DataVisitorTest/DataVisitorTest.h similarity index 100% rename from samples/TestCpp/Classes/DataVisitorTest/DataVisitorTest.h rename to samples/test-cpp/Classes/DataVisitorTest/DataVisitorTest.h diff --git a/samples/TestCpp/Classes/DrawPrimitivesTest/DrawPrimitivesTest.cpp b/samples/test-cpp/Classes/DrawPrimitivesTest/DrawPrimitivesTest.cpp similarity index 100% rename from samples/TestCpp/Classes/DrawPrimitivesTest/DrawPrimitivesTest.cpp rename to samples/test-cpp/Classes/DrawPrimitivesTest/DrawPrimitivesTest.cpp diff --git a/samples/TestCpp/Classes/DrawPrimitivesTest/DrawPrimitivesTest.h b/samples/test-cpp/Classes/DrawPrimitivesTest/DrawPrimitivesTest.h similarity index 100% rename from samples/TestCpp/Classes/DrawPrimitivesTest/DrawPrimitivesTest.h rename to samples/test-cpp/Classes/DrawPrimitivesTest/DrawPrimitivesTest.h diff --git a/samples/TestCpp/Classes/EffectsAdvancedTest/EffectsAdvancedTest.cpp b/samples/test-cpp/Classes/EffectsAdvancedTest/EffectsAdvancedTest.cpp similarity index 100% rename from samples/TestCpp/Classes/EffectsAdvancedTest/EffectsAdvancedTest.cpp rename to samples/test-cpp/Classes/EffectsAdvancedTest/EffectsAdvancedTest.cpp diff --git a/samples/TestCpp/Classes/EffectsAdvancedTest/EffectsAdvancedTest.h b/samples/test-cpp/Classes/EffectsAdvancedTest/EffectsAdvancedTest.h similarity index 100% rename from samples/TestCpp/Classes/EffectsAdvancedTest/EffectsAdvancedTest.h rename to samples/test-cpp/Classes/EffectsAdvancedTest/EffectsAdvancedTest.h diff --git a/samples/TestCpp/Classes/EffectsTest/EffectsTest.cpp b/samples/test-cpp/Classes/EffectsTest/EffectsTest.cpp similarity index 100% rename from samples/TestCpp/Classes/EffectsTest/EffectsTest.cpp rename to samples/test-cpp/Classes/EffectsTest/EffectsTest.cpp diff --git a/samples/TestCpp/Classes/EffectsTest/EffectsTest.h b/samples/test-cpp/Classes/EffectsTest/EffectsTest.h similarity index 100% rename from samples/TestCpp/Classes/EffectsTest/EffectsTest.h rename to samples/test-cpp/Classes/EffectsTest/EffectsTest.h diff --git a/samples/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp diff --git a/samples/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.h b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.h similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.h rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.h diff --git a/samples/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/ComponentsTestScene.cpp b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioComponentsTest/ComponentsTestScene.cpp similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/ComponentsTestScene.cpp rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioComponentsTest/ComponentsTestScene.cpp diff --git a/samples/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/ComponentsTestScene.h b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioComponentsTest/ComponentsTestScene.h similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/ComponentsTestScene.h rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioComponentsTest/ComponentsTestScene.h diff --git a/samples/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/EnemyController.cpp b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioComponentsTest/EnemyController.cpp similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/EnemyController.cpp rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioComponentsTest/EnemyController.cpp diff --git a/samples/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/EnemyController.h b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioComponentsTest/EnemyController.h similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/EnemyController.h rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioComponentsTest/EnemyController.h diff --git a/samples/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/GameOverScene.cpp b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioComponentsTest/GameOverScene.cpp similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/GameOverScene.cpp rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioComponentsTest/GameOverScene.cpp diff --git a/samples/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/GameOverScene.h b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioComponentsTest/GameOverScene.h similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/GameOverScene.h rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioComponentsTest/GameOverScene.h diff --git a/samples/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/PlayerController.cpp b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioComponentsTest/PlayerController.cpp similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/PlayerController.cpp rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioComponentsTest/PlayerController.cpp diff --git a/samples/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/PlayerController.h b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioComponentsTest/PlayerController.h similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/PlayerController.h rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioComponentsTest/PlayerController.h diff --git a/samples/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/ProjectileController.cpp b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioComponentsTest/ProjectileController.cpp similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/ProjectileController.cpp rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioComponentsTest/ProjectileController.cpp diff --git a/samples/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/ProjectileController.h b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioComponentsTest/ProjectileController.h similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/ProjectileController.h rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioComponentsTest/ProjectileController.h diff --git a/samples/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/SceneController.cpp b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioComponentsTest/SceneController.cpp similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/SceneController.cpp rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioComponentsTest/SceneController.cpp diff --git a/samples/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/SceneController.h b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioComponentsTest/SceneController.h similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/SceneController.h rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioComponentsTest/SceneController.h diff --git a/samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/CocosGUIScene.cpp b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/CocosGUIScene.cpp similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/CocosGUIScene.cpp rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/CocosGUIScene.cpp diff --git a/samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/CocosGUIScene.h b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/CocosGUIScene.h similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/CocosGUIScene.h rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/CocosGUIScene.h diff --git a/samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp diff --git a/samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest.h b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest.h similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest.h rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest.h diff --git a/samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest.cpp b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest.cpp similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest.cpp rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest.cpp diff --git a/samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest.h b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest.h similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest.h rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest.h diff --git a/samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.cpp b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.cpp similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.cpp rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.cpp diff --git a/samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.h b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.h similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.h rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.h diff --git a/samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILabelAtlasTest/UILabelAtlasTest.cpp b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UILabelAtlasTest/UILabelAtlasTest.cpp similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILabelAtlasTest/UILabelAtlasTest.cpp rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UILabelAtlasTest/UILabelAtlasTest.cpp diff --git a/samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILabelAtlasTest/UILabelAtlasTest.h b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UILabelAtlasTest/UILabelAtlasTest.h similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILabelAtlasTest/UILabelAtlasTest.h rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UILabelAtlasTest/UILabelAtlasTest.h diff --git a/samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILabelBMFontTest/UILabelBMFontTest.cpp b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UILabelBMFontTest/UILabelBMFontTest.cpp similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILabelBMFontTest/UILabelBMFontTest.cpp rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UILabelBMFontTest/UILabelBMFontTest.cpp diff --git a/samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILabelBMFontTest/UILabelBMFontTest.h b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UILabelBMFontTest/UILabelBMFontTest.h similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILabelBMFontTest/UILabelBMFontTest.h rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UILabelBMFontTest/UILabelBMFontTest.h diff --git a/samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILabelTest/UILabelTest.cpp b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UILabelTest/UILabelTest.cpp similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILabelTest/UILabelTest.cpp rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UILabelTest/UILabelTest.cpp diff --git a/samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILabelTest/UILabelTest.h b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UILabelTest/UILabelTest.h similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILabelTest/UILabelTest.h rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UILabelTest/UILabelTest.h diff --git a/samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest.cpp b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest.cpp similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest.cpp rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest.cpp diff --git a/samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest.h b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest.h similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest.h rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest.h diff --git a/samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIListViewTest/UIListViewTest.cpp b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UIListViewTest/UIListViewTest.cpp similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIListViewTest/UIListViewTest.cpp rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UIListViewTest/UIListViewTest.cpp diff --git a/samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIListViewTest/UIListViewTest.h b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UIListViewTest/UIListViewTest.h similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIListViewTest/UIListViewTest.h rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UIListViewTest/UIListViewTest.h diff --git a/samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest.cpp b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest.cpp similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest.cpp rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest.cpp diff --git a/samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest.h b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest.h similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest.h rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest.h diff --git a/samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest.cpp b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest.cpp similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest.cpp rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest.cpp diff --git a/samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest.h b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest.h similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest.h rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest.h diff --git a/samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIScene.cpp b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UIScene.cpp similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIScene.cpp rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UIScene.cpp diff --git a/samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIScene.h b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UIScene.h similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIScene.h rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UIScene.h diff --git a/samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UISceneManager.cpp b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UISceneManager.cpp similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UISceneManager.cpp rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UISceneManager.cpp diff --git a/samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UISceneManager.h b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UISceneManager.h similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UISceneManager.h rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UISceneManager.h diff --git a/samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.cpp b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.cpp similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.cpp rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.cpp diff --git a/samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.h b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.h similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.h rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.h diff --git a/samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UISliderTest/UISliderTest.cpp b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UISliderTest/UISliderTest.cpp similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UISliderTest/UISliderTest.cpp rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UISliderTest/UISliderTest.cpp diff --git a/samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UISliderTest/UISliderTest.h b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UISliderTest/UISliderTest.h similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UISliderTest/UISliderTest.h rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UISliderTest/UISliderTest.h diff --git a/samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.cpp b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.cpp similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.cpp rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.cpp diff --git a/samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.h b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.h similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.h rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.h diff --git a/samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest.cpp b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest.cpp similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest.cpp rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest.cpp diff --git a/samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest.h b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest.h similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest.h rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest.h diff --git a/samples/TestCpp/Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.cpp b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.cpp similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.cpp rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.cpp diff --git a/samples/TestCpp/Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.h b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.h similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.h rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.h diff --git a/samples/TestCpp/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/EventDef.h b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/EventDef.h similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/EventDef.h rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/EventDef.h diff --git a/samples/TestCpp/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/acts.cpp b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/acts.cpp similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/acts.cpp rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/acts.cpp diff --git a/samples/TestCpp/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/acts.h b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/acts.h similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/acts.h rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/acts.h diff --git a/samples/TestCpp/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/cons.cpp b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/cons.cpp similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/cons.cpp rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/cons.cpp diff --git a/samples/TestCpp/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/cons.h b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/cons.h similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/cons.h rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/cons.h diff --git a/samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsLayerLoader.h b/samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsLayerLoader.h similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsLayerLoader.h rename to samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsLayerLoader.h diff --git a/samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsTestLayer.cpp b/samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsTestLayer.cpp similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsTestLayer.cpp rename to samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsTestLayer.cpp diff --git a/samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsTestLayer.h b/samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsTestLayer.h similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsTestLayer.h rename to samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsTestLayer.h diff --git a/samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayer.cpp b/samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayer.cpp similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayer.cpp rename to samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayer.cpp diff --git a/samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayer.h b/samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayer.h similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayer.h rename to samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayer.h diff --git a/samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayerLoader.h b/samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayerLoader.h similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayerLoader.h rename to samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayerLoader.h diff --git a/samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/CocosBuilderTest.cpp b/samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/CocosBuilderTest.cpp similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/CocosBuilderTest.cpp rename to samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/CocosBuilderTest.cpp diff --git a/samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/CocosBuilderTest.h b/samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/CocosBuilderTest.h similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/CocosBuilderTest.h rename to samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/CocosBuilderTest.h diff --git a/samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayer.cpp b/samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayer.cpp similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayer.cpp rename to samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayer.cpp diff --git a/samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayer.h b/samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayer.h similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayer.h rename to samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayer.h diff --git a/samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayerLoader.h b/samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayerLoader.h similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayerLoader.h rename to samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayerLoader.h diff --git a/samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/LabelTest/LabelTestLayer.h b/samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/LabelTest/LabelTestLayer.h similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/LabelTest/LabelTestLayer.h rename to samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/LabelTest/LabelTestLayer.h diff --git a/samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/LabelTest/LabelTestLayerLoader.h b/samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/LabelTest/LabelTestLayerLoader.h similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/LabelTest/LabelTestLayerLoader.h rename to samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/LabelTest/LabelTestLayerLoader.h diff --git a/samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayer.cpp b/samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayer.cpp similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayer.cpp rename to samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayer.cpp diff --git a/samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayer.h b/samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayer.h similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayer.h rename to samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayer.h diff --git a/samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayerLoader.h b/samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayerLoader.h similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayerLoader.h rename to samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayerLoader.h diff --git a/samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/ParticleSystemTest/ParticleSystemTestLayer.h b/samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/ParticleSystemTest/ParticleSystemTestLayer.h similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/ParticleSystemTest/ParticleSystemTestLayer.h rename to samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/ParticleSystemTest/ParticleSystemTestLayer.h diff --git a/samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/ParticleSystemTest/ParticleSystemTestLayerLoader.h b/samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/ParticleSystemTest/ParticleSystemTestLayerLoader.h similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/ParticleSystemTest/ParticleSystemTestLayerLoader.h rename to samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/ParticleSystemTest/ParticleSystemTestLayerLoader.h diff --git a/samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/ScrollViewTest/ScrollViewTestLayer.h b/samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/ScrollViewTest/ScrollViewTestLayer.h similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/ScrollViewTest/ScrollViewTestLayer.h rename to samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/ScrollViewTest/ScrollViewTestLayer.h diff --git a/samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/ScrollViewTest/ScrollViewTestLayerLoader.h b/samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/ScrollViewTest/ScrollViewTestLayerLoader.h similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/ScrollViewTest/ScrollViewTestLayerLoader.h rename to samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/ScrollViewTest/ScrollViewTestLayerLoader.h diff --git a/samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/SpriteTest/SpriteTestLayer.h b/samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/SpriteTest/SpriteTestLayer.h similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/SpriteTest/SpriteTestLayer.h rename to samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/SpriteTest/SpriteTestLayer.h diff --git a/samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/SpriteTest/SpriteTestLayerLoader.h b/samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/SpriteTest/SpriteTestLayerLoader.h similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/SpriteTest/SpriteTestLayerLoader.h rename to samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/SpriteTest/SpriteTestLayerLoader.h diff --git a/samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayer.cpp b/samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayer.cpp similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayer.cpp rename to samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayer.cpp diff --git a/samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayer.h b/samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayer.h similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayer.h rename to samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayer.h diff --git a/samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayerLoader.h b/samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayerLoader.h similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayerLoader.h rename to samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayerLoader.h diff --git a/samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackLayerLoader.h b/samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackLayerLoader.h similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackLayerLoader.h rename to samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackLayerLoader.h diff --git a/samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackTestLayer.cpp b/samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackTestLayer.cpp similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackTestLayer.cpp rename to samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackTestLayer.cpp diff --git a/samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackTestLayer.h b/samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackTestLayer.h similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackTestLayer.h rename to samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackTestLayer.h diff --git a/samples/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlButtonTest/CCControlButtonTest.cpp b/samples/test-cpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlButtonTest/CCControlButtonTest.cpp similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlButtonTest/CCControlButtonTest.cpp rename to samples/test-cpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlButtonTest/CCControlButtonTest.cpp diff --git a/samples/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlButtonTest/CCControlButtonTest.h b/samples/test-cpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlButtonTest/CCControlButtonTest.h similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlButtonTest/CCControlButtonTest.h rename to samples/test-cpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlButtonTest/CCControlButtonTest.h diff --git a/samples/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlColourPicker/CCControlColourPickerTest.cpp b/samples/test-cpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlColourPicker/CCControlColourPickerTest.cpp similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlColourPicker/CCControlColourPickerTest.cpp rename to samples/test-cpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlColourPicker/CCControlColourPickerTest.cpp diff --git a/samples/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlColourPicker/CCControlColourPickerTest.h b/samples/test-cpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlColourPicker/CCControlColourPickerTest.h similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlColourPicker/CCControlColourPickerTest.h rename to samples/test-cpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlColourPicker/CCControlColourPickerTest.h diff --git a/samples/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlPotentiometerTest/CCControlPotentiometerTest.cpp b/samples/test-cpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlPotentiometerTest/CCControlPotentiometerTest.cpp similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlPotentiometerTest/CCControlPotentiometerTest.cpp rename to samples/test-cpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlPotentiometerTest/CCControlPotentiometerTest.cpp diff --git a/samples/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlPotentiometerTest/CCControlPotentiometerTest.h b/samples/test-cpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlPotentiometerTest/CCControlPotentiometerTest.h similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlPotentiometerTest/CCControlPotentiometerTest.h rename to samples/test-cpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlPotentiometerTest/CCControlPotentiometerTest.h diff --git a/samples/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlScene.cpp b/samples/test-cpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlScene.cpp similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlScene.cpp rename to samples/test-cpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlScene.cpp diff --git a/samples/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlScene.h b/samples/test-cpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlScene.h similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlScene.h rename to samples/test-cpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlScene.h diff --git a/samples/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSceneManager.cpp b/samples/test-cpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSceneManager.cpp similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSceneManager.cpp rename to samples/test-cpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSceneManager.cpp diff --git a/samples/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSceneManager.h b/samples/test-cpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSceneManager.h similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSceneManager.h rename to samples/test-cpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSceneManager.h diff --git a/samples/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSliderTest/CCControlSliderTest.cpp b/samples/test-cpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSliderTest/CCControlSliderTest.cpp similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSliderTest/CCControlSliderTest.cpp rename to samples/test-cpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSliderTest/CCControlSliderTest.cpp diff --git a/samples/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSliderTest/CCControlSliderTest.h b/samples/test-cpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSliderTest/CCControlSliderTest.h similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSliderTest/CCControlSliderTest.h rename to samples/test-cpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSliderTest/CCControlSliderTest.h diff --git a/samples/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlStepperTest/CCControlStepperTest.cpp b/samples/test-cpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlStepperTest/CCControlStepperTest.cpp similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlStepperTest/CCControlStepperTest.cpp rename to samples/test-cpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlStepperTest/CCControlStepperTest.cpp diff --git a/samples/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlStepperTest/CCControlStepperTest.h b/samples/test-cpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlStepperTest/CCControlStepperTest.h similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlStepperTest/CCControlStepperTest.h rename to samples/test-cpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlStepperTest/CCControlStepperTest.h diff --git a/samples/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSwitchTest/CCControlSwitchTest.cpp b/samples/test-cpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSwitchTest/CCControlSwitchTest.cpp similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSwitchTest/CCControlSwitchTest.cpp rename to samples/test-cpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSwitchTest/CCControlSwitchTest.cpp diff --git a/samples/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSwitchTest/CCControlSwitchTest.h b/samples/test-cpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSwitchTest/CCControlSwitchTest.h similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSwitchTest/CCControlSwitchTest.h rename to samples/test-cpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSwitchTest/CCControlSwitchTest.h diff --git a/samples/TestCpp/Classes/ExtensionsTest/EditBoxTest/EditBoxTest.cpp b/samples/test-cpp/Classes/ExtensionsTest/EditBoxTest/EditBoxTest.cpp similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/EditBoxTest/EditBoxTest.cpp rename to samples/test-cpp/Classes/ExtensionsTest/EditBoxTest/EditBoxTest.cpp diff --git a/samples/TestCpp/Classes/ExtensionsTest/EditBoxTest/EditBoxTest.h b/samples/test-cpp/Classes/ExtensionsTest/EditBoxTest/EditBoxTest.h similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/EditBoxTest/EditBoxTest.h rename to samples/test-cpp/Classes/ExtensionsTest/EditBoxTest/EditBoxTest.h diff --git a/samples/TestCpp/Classes/ExtensionsTest/ExtensionsTest.cpp b/samples/test-cpp/Classes/ExtensionsTest/ExtensionsTest.cpp similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/ExtensionsTest.cpp rename to samples/test-cpp/Classes/ExtensionsTest/ExtensionsTest.cpp diff --git a/samples/TestCpp/Classes/ExtensionsTest/ExtensionsTest.h b/samples/test-cpp/Classes/ExtensionsTest/ExtensionsTest.h similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/ExtensionsTest.h rename to samples/test-cpp/Classes/ExtensionsTest/ExtensionsTest.h diff --git a/samples/TestCpp/Classes/ExtensionsTest/NetworkTest/HttpClientTest.cpp b/samples/test-cpp/Classes/ExtensionsTest/NetworkTest/HttpClientTest.cpp similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/NetworkTest/HttpClientTest.cpp rename to samples/test-cpp/Classes/ExtensionsTest/NetworkTest/HttpClientTest.cpp diff --git a/samples/TestCpp/Classes/ExtensionsTest/NetworkTest/HttpClientTest.h b/samples/test-cpp/Classes/ExtensionsTest/NetworkTest/HttpClientTest.h similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/NetworkTest/HttpClientTest.h rename to samples/test-cpp/Classes/ExtensionsTest/NetworkTest/HttpClientTest.h diff --git a/samples/TestCpp/Classes/ExtensionsTest/NetworkTest/SocketIOTest.cpp b/samples/test-cpp/Classes/ExtensionsTest/NetworkTest/SocketIOTest.cpp similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/NetworkTest/SocketIOTest.cpp rename to samples/test-cpp/Classes/ExtensionsTest/NetworkTest/SocketIOTest.cpp diff --git a/samples/TestCpp/Classes/ExtensionsTest/NetworkTest/SocketIOTest.h b/samples/test-cpp/Classes/ExtensionsTest/NetworkTest/SocketIOTest.h similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/NetworkTest/SocketIOTest.h rename to samples/test-cpp/Classes/ExtensionsTest/NetworkTest/SocketIOTest.h diff --git a/samples/TestCpp/Classes/ExtensionsTest/NetworkTest/WebSocketTest.cpp b/samples/test-cpp/Classes/ExtensionsTest/NetworkTest/WebSocketTest.cpp similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/NetworkTest/WebSocketTest.cpp rename to samples/test-cpp/Classes/ExtensionsTest/NetworkTest/WebSocketTest.cpp diff --git a/samples/TestCpp/Classes/ExtensionsTest/NetworkTest/WebSocketTest.h b/samples/test-cpp/Classes/ExtensionsTest/NetworkTest/WebSocketTest.h similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/NetworkTest/WebSocketTest.h rename to samples/test-cpp/Classes/ExtensionsTest/NetworkTest/WebSocketTest.h diff --git a/samples/TestCpp/Classes/ExtensionsTest/NotificationCenterTest/NotificationCenterTest.cpp b/samples/test-cpp/Classes/ExtensionsTest/NotificationCenterTest/NotificationCenterTest.cpp similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/NotificationCenterTest/NotificationCenterTest.cpp rename to samples/test-cpp/Classes/ExtensionsTest/NotificationCenterTest/NotificationCenterTest.cpp diff --git a/samples/TestCpp/Classes/ExtensionsTest/NotificationCenterTest/NotificationCenterTest.h b/samples/test-cpp/Classes/ExtensionsTest/NotificationCenterTest/NotificationCenterTest.h similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/NotificationCenterTest/NotificationCenterTest.h rename to samples/test-cpp/Classes/ExtensionsTest/NotificationCenterTest/NotificationCenterTest.h diff --git a/samples/TestCpp/Classes/ExtensionsTest/Scale9SpriteTest/Scale9SpriteTest.cpp b/samples/test-cpp/Classes/ExtensionsTest/Scale9SpriteTest/Scale9SpriteTest.cpp similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/Scale9SpriteTest/Scale9SpriteTest.cpp rename to samples/test-cpp/Classes/ExtensionsTest/Scale9SpriteTest/Scale9SpriteTest.cpp diff --git a/samples/TestCpp/Classes/ExtensionsTest/Scale9SpriteTest/Scale9SpriteTest.h b/samples/test-cpp/Classes/ExtensionsTest/Scale9SpriteTest/Scale9SpriteTest.h similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/Scale9SpriteTest/Scale9SpriteTest.h rename to samples/test-cpp/Classes/ExtensionsTest/Scale9SpriteTest/Scale9SpriteTest.h diff --git a/samples/TestCpp/Classes/ExtensionsTest/TableViewTest/CustomTableViewCell.cpp b/samples/test-cpp/Classes/ExtensionsTest/TableViewTest/CustomTableViewCell.cpp similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/TableViewTest/CustomTableViewCell.cpp rename to samples/test-cpp/Classes/ExtensionsTest/TableViewTest/CustomTableViewCell.cpp diff --git a/samples/TestCpp/Classes/ExtensionsTest/TableViewTest/CustomTableViewCell.h b/samples/test-cpp/Classes/ExtensionsTest/TableViewTest/CustomTableViewCell.h similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/TableViewTest/CustomTableViewCell.h rename to samples/test-cpp/Classes/ExtensionsTest/TableViewTest/CustomTableViewCell.h diff --git a/samples/TestCpp/Classes/ExtensionsTest/TableViewTest/TableViewTestScene.cpp b/samples/test-cpp/Classes/ExtensionsTest/TableViewTest/TableViewTestScene.cpp similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/TableViewTest/TableViewTestScene.cpp rename to samples/test-cpp/Classes/ExtensionsTest/TableViewTest/TableViewTestScene.cpp diff --git a/samples/TestCpp/Classes/ExtensionsTest/TableViewTest/TableViewTestScene.h b/samples/test-cpp/Classes/ExtensionsTest/TableViewTest/TableViewTestScene.h similarity index 100% rename from samples/TestCpp/Classes/ExtensionsTest/TableViewTest/TableViewTestScene.h rename to samples/test-cpp/Classes/ExtensionsTest/TableViewTest/TableViewTestScene.h diff --git a/samples/TestCpp/Classes/FileUtilsTest/FileUtilsTest.cpp b/samples/test-cpp/Classes/FileUtilsTest/FileUtilsTest.cpp similarity index 100% rename from samples/TestCpp/Classes/FileUtilsTest/FileUtilsTest.cpp rename to samples/test-cpp/Classes/FileUtilsTest/FileUtilsTest.cpp diff --git a/samples/TestCpp/Classes/FileUtilsTest/FileUtilsTest.h b/samples/test-cpp/Classes/FileUtilsTest/FileUtilsTest.h similarity index 100% rename from samples/TestCpp/Classes/FileUtilsTest/FileUtilsTest.h rename to samples/test-cpp/Classes/FileUtilsTest/FileUtilsTest.h diff --git a/samples/TestCpp/Classes/FontTest/FontTest.cpp b/samples/test-cpp/Classes/FontTest/FontTest.cpp similarity index 100% rename from samples/TestCpp/Classes/FontTest/FontTest.cpp rename to samples/test-cpp/Classes/FontTest/FontTest.cpp diff --git a/samples/TestCpp/Classes/FontTest/FontTest.h b/samples/test-cpp/Classes/FontTest/FontTest.h similarity index 100% rename from samples/TestCpp/Classes/FontTest/FontTest.h rename to samples/test-cpp/Classes/FontTest/FontTest.h diff --git a/samples/TestCpp/Classes/InputTest/MouseTest.cpp b/samples/test-cpp/Classes/InputTest/MouseTest.cpp similarity index 100% rename from samples/TestCpp/Classes/InputTest/MouseTest.cpp rename to samples/test-cpp/Classes/InputTest/MouseTest.cpp diff --git a/samples/TestCpp/Classes/InputTest/MouseTest.h b/samples/test-cpp/Classes/InputTest/MouseTest.h similarity index 100% rename from samples/TestCpp/Classes/InputTest/MouseTest.h rename to samples/test-cpp/Classes/InputTest/MouseTest.h diff --git a/samples/TestCpp/Classes/IntervalTest/IntervalTest.cpp b/samples/test-cpp/Classes/IntervalTest/IntervalTest.cpp similarity index 100% rename from samples/TestCpp/Classes/IntervalTest/IntervalTest.cpp rename to samples/test-cpp/Classes/IntervalTest/IntervalTest.cpp diff --git a/samples/TestCpp/Classes/IntervalTest/IntervalTest.h b/samples/test-cpp/Classes/IntervalTest/IntervalTest.h similarity index 100% rename from samples/TestCpp/Classes/IntervalTest/IntervalTest.h rename to samples/test-cpp/Classes/IntervalTest/IntervalTest.h diff --git a/samples/TestCpp/Classes/KeyboardTest/KeyboardTest.cpp b/samples/test-cpp/Classes/KeyboardTest/KeyboardTest.cpp similarity index 100% rename from samples/TestCpp/Classes/KeyboardTest/KeyboardTest.cpp rename to samples/test-cpp/Classes/KeyboardTest/KeyboardTest.cpp diff --git a/samples/TestCpp/Classes/KeyboardTest/KeyboardTest.h b/samples/test-cpp/Classes/KeyboardTest/KeyboardTest.h similarity index 100% rename from samples/TestCpp/Classes/KeyboardTest/KeyboardTest.h rename to samples/test-cpp/Classes/KeyboardTest/KeyboardTest.h diff --git a/samples/TestCpp/Classes/KeypadTest/KeypadTest.cpp b/samples/test-cpp/Classes/KeypadTest/KeypadTest.cpp similarity index 100% rename from samples/TestCpp/Classes/KeypadTest/KeypadTest.cpp rename to samples/test-cpp/Classes/KeypadTest/KeypadTest.cpp diff --git a/samples/TestCpp/Classes/KeypadTest/KeypadTest.h b/samples/test-cpp/Classes/KeypadTest/KeypadTest.h similarity index 100% rename from samples/TestCpp/Classes/KeypadTest/KeypadTest.h rename to samples/test-cpp/Classes/KeypadTest/KeypadTest.h diff --git a/samples/TestCpp/Classes/LabelTest/LabelTest.cpp b/samples/test-cpp/Classes/LabelTest/LabelTest.cpp similarity index 100% rename from samples/TestCpp/Classes/LabelTest/LabelTest.cpp rename to samples/test-cpp/Classes/LabelTest/LabelTest.cpp diff --git a/samples/TestCpp/Classes/LabelTest/LabelTest.h b/samples/test-cpp/Classes/LabelTest/LabelTest.h similarity index 100% rename from samples/TestCpp/Classes/LabelTest/LabelTest.h rename to samples/test-cpp/Classes/LabelTest/LabelTest.h diff --git a/samples/TestCpp/Classes/LabelTest/LabelTestNew.cpp b/samples/test-cpp/Classes/LabelTest/LabelTestNew.cpp similarity index 100% rename from samples/TestCpp/Classes/LabelTest/LabelTestNew.cpp rename to samples/test-cpp/Classes/LabelTest/LabelTestNew.cpp diff --git a/samples/TestCpp/Classes/LabelTest/LabelTestNew.h b/samples/test-cpp/Classes/LabelTest/LabelTestNew.h similarity index 100% rename from samples/TestCpp/Classes/LabelTest/LabelTestNew.h rename to samples/test-cpp/Classes/LabelTest/LabelTestNew.h diff --git a/samples/TestCpp/Classes/LayerTest/LayerTest.cpp b/samples/test-cpp/Classes/LayerTest/LayerTest.cpp similarity index 100% rename from samples/TestCpp/Classes/LayerTest/LayerTest.cpp rename to samples/test-cpp/Classes/LayerTest/LayerTest.cpp diff --git a/samples/TestCpp/Classes/LayerTest/LayerTest.h b/samples/test-cpp/Classes/LayerTest/LayerTest.h similarity index 100% rename from samples/TestCpp/Classes/LayerTest/LayerTest.h rename to samples/test-cpp/Classes/LayerTest/LayerTest.h diff --git a/samples/TestCpp/Classes/MenuTest/MenuTest.cpp b/samples/test-cpp/Classes/MenuTest/MenuTest.cpp similarity index 100% rename from samples/TestCpp/Classes/MenuTest/MenuTest.cpp rename to samples/test-cpp/Classes/MenuTest/MenuTest.cpp diff --git a/samples/TestCpp/Classes/MenuTest/MenuTest.h b/samples/test-cpp/Classes/MenuTest/MenuTest.h similarity index 100% rename from samples/TestCpp/Classes/MenuTest/MenuTest.h rename to samples/test-cpp/Classes/MenuTest/MenuTest.h diff --git a/samples/TestCpp/Classes/MotionStreakTest/MotionStreakTest.cpp b/samples/test-cpp/Classes/MotionStreakTest/MotionStreakTest.cpp similarity index 100% rename from samples/TestCpp/Classes/MotionStreakTest/MotionStreakTest.cpp rename to samples/test-cpp/Classes/MotionStreakTest/MotionStreakTest.cpp diff --git a/samples/TestCpp/Classes/MotionStreakTest/MotionStreakTest.h b/samples/test-cpp/Classes/MotionStreakTest/MotionStreakTest.h similarity index 100% rename from samples/TestCpp/Classes/MotionStreakTest/MotionStreakTest.h rename to samples/test-cpp/Classes/MotionStreakTest/MotionStreakTest.h diff --git a/samples/TestCpp/Classes/MutiTouchTest/MutiTouchTest.cpp b/samples/test-cpp/Classes/MutiTouchTest/MutiTouchTest.cpp similarity index 100% rename from samples/TestCpp/Classes/MutiTouchTest/MutiTouchTest.cpp rename to samples/test-cpp/Classes/MutiTouchTest/MutiTouchTest.cpp diff --git a/samples/TestCpp/Classes/MutiTouchTest/MutiTouchTest.h b/samples/test-cpp/Classes/MutiTouchTest/MutiTouchTest.h similarity index 100% rename from samples/TestCpp/Classes/MutiTouchTest/MutiTouchTest.h rename to samples/test-cpp/Classes/MutiTouchTest/MutiTouchTest.h diff --git a/samples/TestCpp/Classes/NewEventDispatcherTest/NewEventDispatcherTest.cpp b/samples/test-cpp/Classes/NewEventDispatcherTest/NewEventDispatcherTest.cpp similarity index 100% rename from samples/TestCpp/Classes/NewEventDispatcherTest/NewEventDispatcherTest.cpp rename to samples/test-cpp/Classes/NewEventDispatcherTest/NewEventDispatcherTest.cpp diff --git a/samples/TestCpp/Classes/NewEventDispatcherTest/NewEventDispatcherTest.h b/samples/test-cpp/Classes/NewEventDispatcherTest/NewEventDispatcherTest.h similarity index 100% rename from samples/TestCpp/Classes/NewEventDispatcherTest/NewEventDispatcherTest.h rename to samples/test-cpp/Classes/NewEventDispatcherTest/NewEventDispatcherTest.h diff --git a/samples/TestCpp/Classes/NewRendererTest/NewRendererTest.cpp b/samples/test-cpp/Classes/NewRendererTest/NewRendererTest.cpp similarity index 100% rename from samples/TestCpp/Classes/NewRendererTest/NewRendererTest.cpp rename to samples/test-cpp/Classes/NewRendererTest/NewRendererTest.cpp diff --git a/samples/TestCpp/Classes/NewRendererTest/NewRendererTest.h b/samples/test-cpp/Classes/NewRendererTest/NewRendererTest.h similarity index 100% rename from samples/TestCpp/Classes/NewRendererTest/NewRendererTest.h rename to samples/test-cpp/Classes/NewRendererTest/NewRendererTest.h diff --git a/samples/TestCpp/Classes/NodeTest/NodeTest.cpp b/samples/test-cpp/Classes/NodeTest/NodeTest.cpp similarity index 100% rename from samples/TestCpp/Classes/NodeTest/NodeTest.cpp rename to samples/test-cpp/Classes/NodeTest/NodeTest.cpp diff --git a/samples/TestCpp/Classes/NodeTest/NodeTest.h b/samples/test-cpp/Classes/NodeTest/NodeTest.h similarity index 100% rename from samples/TestCpp/Classes/NodeTest/NodeTest.h rename to samples/test-cpp/Classes/NodeTest/NodeTest.h diff --git a/samples/TestCpp/Classes/ParallaxTest/ParallaxTest.cpp b/samples/test-cpp/Classes/ParallaxTest/ParallaxTest.cpp similarity index 100% rename from samples/TestCpp/Classes/ParallaxTest/ParallaxTest.cpp rename to samples/test-cpp/Classes/ParallaxTest/ParallaxTest.cpp diff --git a/samples/TestCpp/Classes/ParallaxTest/ParallaxTest.h b/samples/test-cpp/Classes/ParallaxTest/ParallaxTest.h similarity index 100% rename from samples/TestCpp/Classes/ParallaxTest/ParallaxTest.h rename to samples/test-cpp/Classes/ParallaxTest/ParallaxTest.h diff --git a/samples/TestCpp/Classes/ParticleTest/ParticleTest.cpp b/samples/test-cpp/Classes/ParticleTest/ParticleTest.cpp similarity index 100% rename from samples/TestCpp/Classes/ParticleTest/ParticleTest.cpp rename to samples/test-cpp/Classes/ParticleTest/ParticleTest.cpp diff --git a/samples/TestCpp/Classes/ParticleTest/ParticleTest.h b/samples/test-cpp/Classes/ParticleTest/ParticleTest.h similarity index 100% rename from samples/TestCpp/Classes/ParticleTest/ParticleTest.h rename to samples/test-cpp/Classes/ParticleTest/ParticleTest.h diff --git a/samples/TestCpp/Classes/PerformanceTest/PerformanceAllocTest.cpp b/samples/test-cpp/Classes/PerformanceTest/PerformanceAllocTest.cpp similarity index 100% rename from samples/TestCpp/Classes/PerformanceTest/PerformanceAllocTest.cpp rename to samples/test-cpp/Classes/PerformanceTest/PerformanceAllocTest.cpp diff --git a/samples/TestCpp/Classes/PerformanceTest/PerformanceAllocTest.h b/samples/test-cpp/Classes/PerformanceTest/PerformanceAllocTest.h similarity index 100% rename from samples/TestCpp/Classes/PerformanceTest/PerformanceAllocTest.h rename to samples/test-cpp/Classes/PerformanceTest/PerformanceAllocTest.h diff --git a/samples/TestCpp/Classes/PerformanceTest/PerformanceContainerTest.cpp b/samples/test-cpp/Classes/PerformanceTest/PerformanceContainerTest.cpp similarity index 100% rename from samples/TestCpp/Classes/PerformanceTest/PerformanceContainerTest.cpp rename to samples/test-cpp/Classes/PerformanceTest/PerformanceContainerTest.cpp diff --git a/samples/TestCpp/Classes/PerformanceTest/PerformanceContainerTest.h b/samples/test-cpp/Classes/PerformanceTest/PerformanceContainerTest.h similarity index 100% rename from samples/TestCpp/Classes/PerformanceTest/PerformanceContainerTest.h rename to samples/test-cpp/Classes/PerformanceTest/PerformanceContainerTest.h diff --git a/samples/TestCpp/Classes/PerformanceTest/PerformanceEventDispatcherTest.cpp b/samples/test-cpp/Classes/PerformanceTest/PerformanceEventDispatcherTest.cpp similarity index 100% rename from samples/TestCpp/Classes/PerformanceTest/PerformanceEventDispatcherTest.cpp rename to samples/test-cpp/Classes/PerformanceTest/PerformanceEventDispatcherTest.cpp diff --git a/samples/TestCpp/Classes/PerformanceTest/PerformanceEventDispatcherTest.h b/samples/test-cpp/Classes/PerformanceTest/PerformanceEventDispatcherTest.h similarity index 100% rename from samples/TestCpp/Classes/PerformanceTest/PerformanceEventDispatcherTest.h rename to samples/test-cpp/Classes/PerformanceTest/PerformanceEventDispatcherTest.h diff --git a/samples/TestCpp/Classes/PerformanceTest/PerformanceLabelTest.cpp b/samples/test-cpp/Classes/PerformanceTest/PerformanceLabelTest.cpp similarity index 100% rename from samples/TestCpp/Classes/PerformanceTest/PerformanceLabelTest.cpp rename to samples/test-cpp/Classes/PerformanceTest/PerformanceLabelTest.cpp diff --git a/samples/TestCpp/Classes/PerformanceTest/PerformanceLabelTest.h b/samples/test-cpp/Classes/PerformanceTest/PerformanceLabelTest.h similarity index 100% rename from samples/TestCpp/Classes/PerformanceTest/PerformanceLabelTest.h rename to samples/test-cpp/Classes/PerformanceTest/PerformanceLabelTest.h diff --git a/samples/TestCpp/Classes/PerformanceTest/PerformanceNodeChildrenTest.cpp b/samples/test-cpp/Classes/PerformanceTest/PerformanceNodeChildrenTest.cpp similarity index 100% rename from samples/TestCpp/Classes/PerformanceTest/PerformanceNodeChildrenTest.cpp rename to samples/test-cpp/Classes/PerformanceTest/PerformanceNodeChildrenTest.cpp diff --git a/samples/TestCpp/Classes/PerformanceTest/PerformanceNodeChildrenTest.h b/samples/test-cpp/Classes/PerformanceTest/PerformanceNodeChildrenTest.h similarity index 100% rename from samples/TestCpp/Classes/PerformanceTest/PerformanceNodeChildrenTest.h rename to samples/test-cpp/Classes/PerformanceTest/PerformanceNodeChildrenTest.h diff --git a/samples/TestCpp/Classes/PerformanceTest/PerformanceParticleTest.cpp b/samples/test-cpp/Classes/PerformanceTest/PerformanceParticleTest.cpp similarity index 100% rename from samples/TestCpp/Classes/PerformanceTest/PerformanceParticleTest.cpp rename to samples/test-cpp/Classes/PerformanceTest/PerformanceParticleTest.cpp diff --git a/samples/TestCpp/Classes/PerformanceTest/PerformanceParticleTest.h b/samples/test-cpp/Classes/PerformanceTest/PerformanceParticleTest.h similarity index 100% rename from samples/TestCpp/Classes/PerformanceTest/PerformanceParticleTest.h rename to samples/test-cpp/Classes/PerformanceTest/PerformanceParticleTest.h diff --git a/samples/TestCpp/Classes/PerformanceTest/PerformanceRendererTest.cpp b/samples/test-cpp/Classes/PerformanceTest/PerformanceRendererTest.cpp similarity index 100% rename from samples/TestCpp/Classes/PerformanceTest/PerformanceRendererTest.cpp rename to samples/test-cpp/Classes/PerformanceTest/PerformanceRendererTest.cpp diff --git a/samples/TestCpp/Classes/PerformanceTest/PerformanceRendererTest.h b/samples/test-cpp/Classes/PerformanceTest/PerformanceRendererTest.h similarity index 100% rename from samples/TestCpp/Classes/PerformanceTest/PerformanceRendererTest.h rename to samples/test-cpp/Classes/PerformanceTest/PerformanceRendererTest.h diff --git a/samples/TestCpp/Classes/PerformanceTest/PerformanceSpriteTest.cpp b/samples/test-cpp/Classes/PerformanceTest/PerformanceSpriteTest.cpp similarity index 100% rename from samples/TestCpp/Classes/PerformanceTest/PerformanceSpriteTest.cpp rename to samples/test-cpp/Classes/PerformanceTest/PerformanceSpriteTest.cpp diff --git a/samples/TestCpp/Classes/PerformanceTest/PerformanceSpriteTest.h b/samples/test-cpp/Classes/PerformanceTest/PerformanceSpriteTest.h similarity index 100% rename from samples/TestCpp/Classes/PerformanceTest/PerformanceSpriteTest.h rename to samples/test-cpp/Classes/PerformanceTest/PerformanceSpriteTest.h diff --git a/samples/TestCpp/Classes/PerformanceTest/PerformanceTest.cpp b/samples/test-cpp/Classes/PerformanceTest/PerformanceTest.cpp similarity index 100% rename from samples/TestCpp/Classes/PerformanceTest/PerformanceTest.cpp rename to samples/test-cpp/Classes/PerformanceTest/PerformanceTest.cpp diff --git a/samples/TestCpp/Classes/PerformanceTest/PerformanceTest.h b/samples/test-cpp/Classes/PerformanceTest/PerformanceTest.h similarity index 100% rename from samples/TestCpp/Classes/PerformanceTest/PerformanceTest.h rename to samples/test-cpp/Classes/PerformanceTest/PerformanceTest.h diff --git a/samples/TestCpp/Classes/PerformanceTest/PerformanceTextureTest.cpp b/samples/test-cpp/Classes/PerformanceTest/PerformanceTextureTest.cpp similarity index 100% rename from samples/TestCpp/Classes/PerformanceTest/PerformanceTextureTest.cpp rename to samples/test-cpp/Classes/PerformanceTest/PerformanceTextureTest.cpp diff --git a/samples/TestCpp/Classes/PerformanceTest/PerformanceTextureTest.h b/samples/test-cpp/Classes/PerformanceTest/PerformanceTextureTest.h similarity index 100% rename from samples/TestCpp/Classes/PerformanceTest/PerformanceTextureTest.h rename to samples/test-cpp/Classes/PerformanceTest/PerformanceTextureTest.h diff --git a/samples/TestCpp/Classes/PerformanceTest/PerformanceTouchesTest.cpp b/samples/test-cpp/Classes/PerformanceTest/PerformanceTouchesTest.cpp similarity index 100% rename from samples/TestCpp/Classes/PerformanceTest/PerformanceTouchesTest.cpp rename to samples/test-cpp/Classes/PerformanceTest/PerformanceTouchesTest.cpp diff --git a/samples/TestCpp/Classes/PerformanceTest/PerformanceTouchesTest.h b/samples/test-cpp/Classes/PerformanceTest/PerformanceTouchesTest.h similarity index 100% rename from samples/TestCpp/Classes/PerformanceTest/PerformanceTouchesTest.h rename to samples/test-cpp/Classes/PerformanceTest/PerformanceTouchesTest.h diff --git a/samples/TestCpp/Classes/PhysicsTest/PhysicsTest.cpp b/samples/test-cpp/Classes/PhysicsTest/PhysicsTest.cpp similarity index 100% rename from samples/TestCpp/Classes/PhysicsTest/PhysicsTest.cpp rename to samples/test-cpp/Classes/PhysicsTest/PhysicsTest.cpp diff --git a/samples/TestCpp/Classes/PhysicsTest/PhysicsTest.h b/samples/test-cpp/Classes/PhysicsTest/PhysicsTest.h similarity index 100% rename from samples/TestCpp/Classes/PhysicsTest/PhysicsTest.h rename to samples/test-cpp/Classes/PhysicsTest/PhysicsTest.h diff --git a/samples/TestCpp/Classes/ReleasePoolTest/ReleasePoolTest.cpp b/samples/test-cpp/Classes/ReleasePoolTest/ReleasePoolTest.cpp similarity index 100% rename from samples/TestCpp/Classes/ReleasePoolTest/ReleasePoolTest.cpp rename to samples/test-cpp/Classes/ReleasePoolTest/ReleasePoolTest.cpp diff --git a/samples/TestCpp/Classes/ReleasePoolTest/ReleasePoolTest.h b/samples/test-cpp/Classes/ReleasePoolTest/ReleasePoolTest.h similarity index 100% rename from samples/TestCpp/Classes/ReleasePoolTest/ReleasePoolTest.h rename to samples/test-cpp/Classes/ReleasePoolTest/ReleasePoolTest.h diff --git a/samples/TestCpp/Classes/RenderTextureTest/RenderTextureTest.cpp b/samples/test-cpp/Classes/RenderTextureTest/RenderTextureTest.cpp similarity index 100% rename from samples/TestCpp/Classes/RenderTextureTest/RenderTextureTest.cpp rename to samples/test-cpp/Classes/RenderTextureTest/RenderTextureTest.cpp diff --git a/samples/TestCpp/Classes/RenderTextureTest/RenderTextureTest.h b/samples/test-cpp/Classes/RenderTextureTest/RenderTextureTest.h similarity index 100% rename from samples/TestCpp/Classes/RenderTextureTest/RenderTextureTest.h rename to samples/test-cpp/Classes/RenderTextureTest/RenderTextureTest.h diff --git a/samples/TestCpp/Classes/RotateWorldTest/RotateWorldTest.cpp b/samples/test-cpp/Classes/RotateWorldTest/RotateWorldTest.cpp similarity index 100% rename from samples/TestCpp/Classes/RotateWorldTest/RotateWorldTest.cpp rename to samples/test-cpp/Classes/RotateWorldTest/RotateWorldTest.cpp diff --git a/samples/TestCpp/Classes/RotateWorldTest/RotateWorldTest.h b/samples/test-cpp/Classes/RotateWorldTest/RotateWorldTest.h similarity index 100% rename from samples/TestCpp/Classes/RotateWorldTest/RotateWorldTest.h rename to samples/test-cpp/Classes/RotateWorldTest/RotateWorldTest.h diff --git a/samples/TestCpp/Classes/SceneTest/SceneTest.cpp b/samples/test-cpp/Classes/SceneTest/SceneTest.cpp similarity index 100% rename from samples/TestCpp/Classes/SceneTest/SceneTest.cpp rename to samples/test-cpp/Classes/SceneTest/SceneTest.cpp diff --git a/samples/TestCpp/Classes/SceneTest/SceneTest.h b/samples/test-cpp/Classes/SceneTest/SceneTest.h similarity index 100% rename from samples/TestCpp/Classes/SceneTest/SceneTest.h rename to samples/test-cpp/Classes/SceneTest/SceneTest.h diff --git a/samples/TestCpp/Classes/SchedulerTest/SchedulerTest.cpp b/samples/test-cpp/Classes/SchedulerTest/SchedulerTest.cpp similarity index 100% rename from samples/TestCpp/Classes/SchedulerTest/SchedulerTest.cpp rename to samples/test-cpp/Classes/SchedulerTest/SchedulerTest.cpp diff --git a/samples/TestCpp/Classes/SchedulerTest/SchedulerTest.h b/samples/test-cpp/Classes/SchedulerTest/SchedulerTest.h similarity index 100% rename from samples/TestCpp/Classes/SchedulerTest/SchedulerTest.h rename to samples/test-cpp/Classes/SchedulerTest/SchedulerTest.h diff --git a/samples/TestCpp/Classes/ShaderTest/ShaderTest.cpp b/samples/test-cpp/Classes/ShaderTest/ShaderTest.cpp similarity index 100% rename from samples/TestCpp/Classes/ShaderTest/ShaderTest.cpp rename to samples/test-cpp/Classes/ShaderTest/ShaderTest.cpp diff --git a/samples/TestCpp/Classes/ShaderTest/ShaderTest.h b/samples/test-cpp/Classes/ShaderTest/ShaderTest.h similarity index 100% rename from samples/TestCpp/Classes/ShaderTest/ShaderTest.h rename to samples/test-cpp/Classes/ShaderTest/ShaderTest.h diff --git a/samples/TestCpp/Classes/ShaderTest/ShaderTest2.cpp b/samples/test-cpp/Classes/ShaderTest/ShaderTest2.cpp similarity index 100% rename from samples/TestCpp/Classes/ShaderTest/ShaderTest2.cpp rename to samples/test-cpp/Classes/ShaderTest/ShaderTest2.cpp diff --git a/samples/TestCpp/Classes/ShaderTest/ShaderTest2.h b/samples/test-cpp/Classes/ShaderTest/ShaderTest2.h similarity index 100% rename from samples/TestCpp/Classes/ShaderTest/ShaderTest2.h rename to samples/test-cpp/Classes/ShaderTest/ShaderTest2.h diff --git a/samples/TestCpp/Classes/SpineTest/SpineTest.cpp b/samples/test-cpp/Classes/SpineTest/SpineTest.cpp similarity index 100% rename from samples/TestCpp/Classes/SpineTest/SpineTest.cpp rename to samples/test-cpp/Classes/SpineTest/SpineTest.cpp diff --git a/samples/TestCpp/Classes/SpineTest/SpineTest.h b/samples/test-cpp/Classes/SpineTest/SpineTest.h similarity index 100% rename from samples/TestCpp/Classes/SpineTest/SpineTest.h rename to samples/test-cpp/Classes/SpineTest/SpineTest.h diff --git a/samples/TestCpp/Classes/SpriteTest/SpriteTest.cpp.REMOVED.git-id b/samples/test-cpp/Classes/SpriteTest/SpriteTest.cpp.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Classes/SpriteTest/SpriteTest.cpp.REMOVED.git-id rename to samples/test-cpp/Classes/SpriteTest/SpriteTest.cpp.REMOVED.git-id diff --git a/samples/TestCpp/Classes/SpriteTest/SpriteTest.h b/samples/test-cpp/Classes/SpriteTest/SpriteTest.h similarity index 100% rename from samples/TestCpp/Classes/SpriteTest/SpriteTest.h rename to samples/test-cpp/Classes/SpriteTest/SpriteTest.h diff --git a/samples/TestCpp/Classes/TextInputTest/TextInputTest.cpp b/samples/test-cpp/Classes/TextInputTest/TextInputTest.cpp similarity index 100% rename from samples/TestCpp/Classes/TextInputTest/TextInputTest.cpp rename to samples/test-cpp/Classes/TextInputTest/TextInputTest.cpp diff --git a/samples/TestCpp/Classes/TextInputTest/TextInputTest.h b/samples/test-cpp/Classes/TextInputTest/TextInputTest.h similarity index 100% rename from samples/TestCpp/Classes/TextInputTest/TextInputTest.h rename to samples/test-cpp/Classes/TextInputTest/TextInputTest.h diff --git a/samples/TestCpp/Classes/Texture2dTest/Texture2dTest.cpp b/samples/test-cpp/Classes/Texture2dTest/Texture2dTest.cpp similarity index 100% rename from samples/TestCpp/Classes/Texture2dTest/Texture2dTest.cpp rename to samples/test-cpp/Classes/Texture2dTest/Texture2dTest.cpp diff --git a/samples/TestCpp/Classes/Texture2dTest/Texture2dTest.h b/samples/test-cpp/Classes/Texture2dTest/Texture2dTest.h similarity index 100% rename from samples/TestCpp/Classes/Texture2dTest/Texture2dTest.h rename to samples/test-cpp/Classes/Texture2dTest/Texture2dTest.h diff --git a/samples/TestCpp/Classes/TextureCacheTest/TextureCacheTest.cpp b/samples/test-cpp/Classes/TextureCacheTest/TextureCacheTest.cpp similarity index 100% rename from samples/TestCpp/Classes/TextureCacheTest/TextureCacheTest.cpp rename to samples/test-cpp/Classes/TextureCacheTest/TextureCacheTest.cpp diff --git a/samples/TestCpp/Classes/TextureCacheTest/TextureCacheTest.h b/samples/test-cpp/Classes/TextureCacheTest/TextureCacheTest.h similarity index 100% rename from samples/TestCpp/Classes/TextureCacheTest/TextureCacheTest.h rename to samples/test-cpp/Classes/TextureCacheTest/TextureCacheTest.h diff --git a/samples/TestCpp/Classes/TexturePackerEncryptionTest/TextureAtlasEncryptionTest.cpp b/samples/test-cpp/Classes/TexturePackerEncryptionTest/TextureAtlasEncryptionTest.cpp similarity index 100% rename from samples/TestCpp/Classes/TexturePackerEncryptionTest/TextureAtlasEncryptionTest.cpp rename to samples/test-cpp/Classes/TexturePackerEncryptionTest/TextureAtlasEncryptionTest.cpp diff --git a/samples/TestCpp/Classes/TexturePackerEncryptionTest/TextureAtlasEncryptionTest.h b/samples/test-cpp/Classes/TexturePackerEncryptionTest/TextureAtlasEncryptionTest.h similarity index 100% rename from samples/TestCpp/Classes/TexturePackerEncryptionTest/TextureAtlasEncryptionTest.h rename to samples/test-cpp/Classes/TexturePackerEncryptionTest/TextureAtlasEncryptionTest.h diff --git a/samples/TestCpp/Classes/TileMapTest/TileMapTest.cpp b/samples/test-cpp/Classes/TileMapTest/TileMapTest.cpp similarity index 100% rename from samples/TestCpp/Classes/TileMapTest/TileMapTest.cpp rename to samples/test-cpp/Classes/TileMapTest/TileMapTest.cpp diff --git a/samples/TestCpp/Classes/TileMapTest/TileMapTest.h b/samples/test-cpp/Classes/TileMapTest/TileMapTest.h similarity index 100% rename from samples/TestCpp/Classes/TileMapTest/TileMapTest.h rename to samples/test-cpp/Classes/TileMapTest/TileMapTest.h diff --git a/samples/TestCpp/Classes/TouchesTest/Ball.cpp b/samples/test-cpp/Classes/TouchesTest/Ball.cpp similarity index 100% rename from samples/TestCpp/Classes/TouchesTest/Ball.cpp rename to samples/test-cpp/Classes/TouchesTest/Ball.cpp diff --git a/samples/TestCpp/Classes/TouchesTest/Ball.h b/samples/test-cpp/Classes/TouchesTest/Ball.h similarity index 100% rename from samples/TestCpp/Classes/TouchesTest/Ball.h rename to samples/test-cpp/Classes/TouchesTest/Ball.h diff --git a/samples/TestCpp/Classes/TouchesTest/Paddle.cpp b/samples/test-cpp/Classes/TouchesTest/Paddle.cpp similarity index 100% rename from samples/TestCpp/Classes/TouchesTest/Paddle.cpp rename to samples/test-cpp/Classes/TouchesTest/Paddle.cpp diff --git a/samples/TestCpp/Classes/TouchesTest/Paddle.h b/samples/test-cpp/Classes/TouchesTest/Paddle.h similarity index 100% rename from samples/TestCpp/Classes/TouchesTest/Paddle.h rename to samples/test-cpp/Classes/TouchesTest/Paddle.h diff --git a/samples/TestCpp/Classes/TouchesTest/TouchesTest.cpp b/samples/test-cpp/Classes/TouchesTest/TouchesTest.cpp similarity index 100% rename from samples/TestCpp/Classes/TouchesTest/TouchesTest.cpp rename to samples/test-cpp/Classes/TouchesTest/TouchesTest.cpp diff --git a/samples/TestCpp/Classes/TouchesTest/TouchesTest.h b/samples/test-cpp/Classes/TouchesTest/TouchesTest.h similarity index 100% rename from samples/TestCpp/Classes/TouchesTest/TouchesTest.h rename to samples/test-cpp/Classes/TouchesTest/TouchesTest.h diff --git a/samples/TestCpp/Classes/TransitionsTest/TransitionsTest.cpp b/samples/test-cpp/Classes/TransitionsTest/TransitionsTest.cpp similarity index 100% rename from samples/TestCpp/Classes/TransitionsTest/TransitionsTest.cpp rename to samples/test-cpp/Classes/TransitionsTest/TransitionsTest.cpp diff --git a/samples/TestCpp/Classes/TransitionsTest/TransitionsTest.h b/samples/test-cpp/Classes/TransitionsTest/TransitionsTest.h similarity index 100% rename from samples/TestCpp/Classes/TransitionsTest/TransitionsTest.h rename to samples/test-cpp/Classes/TransitionsTest/TransitionsTest.h diff --git a/samples/TestCpp/Classes/UnitTest/UnitTest.cpp b/samples/test-cpp/Classes/UnitTest/UnitTest.cpp similarity index 100% rename from samples/TestCpp/Classes/UnitTest/UnitTest.cpp rename to samples/test-cpp/Classes/UnitTest/UnitTest.cpp diff --git a/samples/TestCpp/Classes/UnitTest/UnitTest.h b/samples/test-cpp/Classes/UnitTest/UnitTest.h similarity index 100% rename from samples/TestCpp/Classes/UnitTest/UnitTest.h rename to samples/test-cpp/Classes/UnitTest/UnitTest.h diff --git a/samples/TestCpp/Classes/UserDefaultTest/UserDefaultTest.cpp b/samples/test-cpp/Classes/UserDefaultTest/UserDefaultTest.cpp similarity index 100% rename from samples/TestCpp/Classes/UserDefaultTest/UserDefaultTest.cpp rename to samples/test-cpp/Classes/UserDefaultTest/UserDefaultTest.cpp diff --git a/samples/TestCpp/Classes/UserDefaultTest/UserDefaultTest.h b/samples/test-cpp/Classes/UserDefaultTest/UserDefaultTest.h similarity index 100% rename from samples/TestCpp/Classes/UserDefaultTest/UserDefaultTest.h rename to samples/test-cpp/Classes/UserDefaultTest/UserDefaultTest.h diff --git a/samples/TestCpp/Classes/VisibleRect.cpp b/samples/test-cpp/Classes/VisibleRect.cpp similarity index 100% rename from samples/TestCpp/Classes/VisibleRect.cpp rename to samples/test-cpp/Classes/VisibleRect.cpp diff --git a/samples/TestCpp/Classes/VisibleRect.h b/samples/test-cpp/Classes/VisibleRect.h similarity index 100% rename from samples/TestCpp/Classes/VisibleRect.h rename to samples/test-cpp/Classes/VisibleRect.h diff --git a/samples/TestCpp/Classes/ZwoptexTest/ZwoptexTest.cpp b/samples/test-cpp/Classes/ZwoptexTest/ZwoptexTest.cpp similarity index 100% rename from samples/TestCpp/Classes/ZwoptexTest/ZwoptexTest.cpp rename to samples/test-cpp/Classes/ZwoptexTest/ZwoptexTest.cpp diff --git a/samples/TestCpp/Classes/ZwoptexTest/ZwoptexTest.h b/samples/test-cpp/Classes/ZwoptexTest/ZwoptexTest.h similarity index 100% rename from samples/TestCpp/Classes/ZwoptexTest/ZwoptexTest.h rename to samples/test-cpp/Classes/ZwoptexTest/ZwoptexTest.h diff --git a/samples/TestCpp/Classes/controller.cpp b/samples/test-cpp/Classes/controller.cpp similarity index 100% rename from samples/TestCpp/Classes/controller.cpp rename to samples/test-cpp/Classes/controller.cpp diff --git a/samples/TestCpp/Classes/controller.h b/samples/test-cpp/Classes/controller.h similarity index 100% rename from samples/TestCpp/Classes/controller.h rename to samples/test-cpp/Classes/controller.h diff --git a/samples/TestCpp/Classes/testBasic.cpp b/samples/test-cpp/Classes/testBasic.cpp similarity index 100% rename from samples/TestCpp/Classes/testBasic.cpp rename to samples/test-cpp/Classes/testBasic.cpp diff --git a/samples/TestCpp/Classes/testBasic.h b/samples/test-cpp/Classes/testBasic.h similarity index 100% rename from samples/TestCpp/Classes/testBasic.h rename to samples/test-cpp/Classes/testBasic.h diff --git a/samples/TestCpp/Classes/testResource.h b/samples/test-cpp/Classes/testResource.h similarity index 100% rename from samples/TestCpp/Classes/testResource.h rename to samples/test-cpp/Classes/testResource.h diff --git a/samples/TestCpp/Classes/tests.h b/samples/test-cpp/Classes/tests.h similarity index 100% rename from samples/TestCpp/Classes/tests.h rename to samples/test-cpp/Classes/tests.h diff --git a/samples/TestCpp/Resources/.gitignore b/samples/test-cpp/Resources/.gitignore similarity index 100% rename from samples/TestCpp/Resources/.gitignore rename to samples/test-cpp/Resources/.gitignore diff --git a/samples/TestCpp/Resources/Hello.png.REMOVED.git-id b/samples/test-cpp/Resources/Hello.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/Hello.png.REMOVED.git-id rename to samples/test-cpp/Resources/Hello.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/Images/HelloWorld.png.REMOVED.git-id b/samples/test-cpp/Resources/Images/HelloWorld.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/Images/HelloWorld.png.REMOVED.git-id rename to samples/test-cpp/Resources/Images/HelloWorld.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/Images/PlanetCute-1024x1024.png.REMOVED.git-id b/samples/test-cpp/Resources/Images/PlanetCute-1024x1024.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/Images/PlanetCute-1024x1024.png.REMOVED.git-id rename to samples/test-cpp/Resources/Images/PlanetCute-1024x1024.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/Images/atlastest.png.REMOVED.git-id b/samples/test-cpp/Resources/Images/atlastest.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/Images/atlastest.png.REMOVED.git-id rename to samples/test-cpp/Resources/Images/atlastest.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/Images/background1.png.REMOVED.git-id b/samples/test-cpp/Resources/Images/background1.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/Images/background1.png.REMOVED.git-id rename to samples/test-cpp/Resources/Images/background1.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/Images/background2.jpg.REMOVED.git-id b/samples/test-cpp/Resources/Images/background2.jpg.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/Images/background2.jpg.REMOVED.git-id rename to samples/test-cpp/Resources/Images/background2.jpg.REMOVED.git-id diff --git a/samples/TestCpp/Resources/Images/background2.png.REMOVED.git-id b/samples/test-cpp/Resources/Images/background2.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/Images/background2.png.REMOVED.git-id rename to samples/test-cpp/Resources/Images/background2.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/Images/bugs/bug886.png.REMOVED.git-id b/samples/test-cpp/Resources/Images/bugs/bug886.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/Images/bugs/bug886.png.REMOVED.git-id rename to samples/test-cpp/Resources/Images/bugs/bug886.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/Images/grossini_dance_atlas-mono.png.REMOVED.git-id b/samples/test-cpp/Resources/Images/grossini_dance_atlas-mono.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/Images/grossini_dance_atlas-mono.png.REMOVED.git-id rename to samples/test-cpp/Resources/Images/grossini_dance_atlas-mono.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/Images/landscape-1024x1024.png.REMOVED.git-id b/samples/test-cpp/Resources/Images/landscape-1024x1024.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/Images/landscape-1024x1024.png.REMOVED.git-id rename to samples/test-cpp/Resources/Images/landscape-1024x1024.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/Images/noise.png.REMOVED.git-id b/samples/test-cpp/Resources/Images/noise.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/Images/noise.png.REMOVED.git-id rename to samples/test-cpp/Resources/Images/noise.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/Images/spritesheet1.png.REMOVED.git-id b/samples/test-cpp/Resources/Images/spritesheet1.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/Images/spritesheet1.png.REMOVED.git-id rename to samples/test-cpp/Resources/Images/spritesheet1.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/Images/stone.png.REMOVED.git-id b/samples/test-cpp/Resources/Images/stone.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/Images/stone.png.REMOVED.git-id rename to samples/test-cpp/Resources/Images/stone.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/Images/test_1021x1024.png.REMOVED.git-id b/samples/test-cpp/Resources/Images/test_1021x1024.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/Images/test_1021x1024.png.REMOVED.git-id rename to samples/test-cpp/Resources/Images/test_1021x1024.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/Images/test_1021x1024_a8.pvr.REMOVED.git-id b/samples/test-cpp/Resources/Images/test_1021x1024_a8.pvr.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/Images/test_1021x1024_a8.pvr.REMOVED.git-id rename to samples/test-cpp/Resources/Images/test_1021x1024_a8.pvr.REMOVED.git-id diff --git a/samples/TestCpp/Resources/Images/test_1021x1024_rgb888.pvr.REMOVED.git-id b/samples/test-cpp/Resources/Images/test_1021x1024_rgb888.pvr.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/Images/test_1021x1024_rgb888.pvr.REMOVED.git-id rename to samples/test-cpp/Resources/Images/test_1021x1024_rgb888.pvr.REMOVED.git-id diff --git a/samples/TestCpp/Resources/Images/test_1021x1024_rgb888.pvr.gz.REMOVED.git-id b/samples/test-cpp/Resources/Images/test_1021x1024_rgb888.pvr.gz.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/Images/test_1021x1024_rgb888.pvr.gz.REMOVED.git-id rename to samples/test-cpp/Resources/Images/test_1021x1024_rgb888.pvr.gz.REMOVED.git-id diff --git a/samples/TestCpp/Resources/Images/test_1021x1024_rgba4444.pvr.REMOVED.git-id b/samples/test-cpp/Resources/Images/test_1021x1024_rgba4444.pvr.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/Images/test_1021x1024_rgba4444.pvr.REMOVED.git-id rename to samples/test-cpp/Resources/Images/test_1021x1024_rgba4444.pvr.REMOVED.git-id diff --git a/samples/TestCpp/Resources/Images/test_1021x1024_rgba4444.pvr.gz.REMOVED.git-id b/samples/test-cpp/Resources/Images/test_1021x1024_rgba4444.pvr.gz.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/Images/test_1021x1024_rgba4444.pvr.gz.REMOVED.git-id rename to samples/test-cpp/Resources/Images/test_1021x1024_rgba4444.pvr.gz.REMOVED.git-id diff --git a/samples/TestCpp/Resources/Images/test_1021x1024_rgba8888.pvr.REMOVED.git-id b/samples/test-cpp/Resources/Images/test_1021x1024_rgba8888.pvr.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/Images/test_1021x1024_rgba8888.pvr.REMOVED.git-id rename to samples/test-cpp/Resources/Images/test_1021x1024_rgba8888.pvr.REMOVED.git-id diff --git a/samples/TestCpp/Resources/Images/test_1021x1024_rgba8888.pvr.gz.REMOVED.git-id b/samples/test-cpp/Resources/Images/test_1021x1024_rgba8888.pvr.gz.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/Images/test_1021x1024_rgba8888.pvr.gz.REMOVED.git-id rename to samples/test-cpp/Resources/Images/test_1021x1024_rgba8888.pvr.gz.REMOVED.git-id diff --git a/samples/TestCpp/Resources/Misc/resources-hd/test4.txt b/samples/test-cpp/Resources/Misc/resources-hd/test4.txt similarity index 100% rename from samples/TestCpp/Resources/Misc/resources-hd/test4.txt rename to samples/test-cpp/Resources/Misc/resources-hd/test4.txt diff --git a/samples/TestCpp/Resources/Misc/resources-ipad/test2.txt b/samples/test-cpp/Resources/Misc/resources-ipad/test2.txt similarity index 100% rename from samples/TestCpp/Resources/Misc/resources-ipad/test2.txt rename to samples/test-cpp/Resources/Misc/resources-ipad/test2.txt diff --git a/samples/TestCpp/Resources/Misc/resources-ipadhd/test1.txt b/samples/test-cpp/Resources/Misc/resources-ipadhd/test1.txt similarity index 100% rename from samples/TestCpp/Resources/Misc/resources-ipadhd/test1.txt rename to samples/test-cpp/Resources/Misc/resources-ipadhd/test1.txt diff --git a/samples/TestCpp/Resources/Misc/resources-iphone/test6.txt b/samples/test-cpp/Resources/Misc/resources-iphone/test6.txt similarity index 100% rename from samples/TestCpp/Resources/Misc/resources-iphone/test6.txt rename to samples/test-cpp/Resources/Misc/resources-iphone/test6.txt diff --git a/samples/TestCpp/Resources/Misc/resources-mac/test2.txt b/samples/test-cpp/Resources/Misc/resources-mac/test2.txt similarity index 100% rename from samples/TestCpp/Resources/Misc/resources-mac/test2.txt rename to samples/test-cpp/Resources/Misc/resources-mac/test2.txt diff --git a/samples/TestCpp/Resources/Misc/resources-machd/test1.txt b/samples/test-cpp/Resources/Misc/resources-machd/test1.txt similarity index 100% rename from samples/TestCpp/Resources/Misc/resources-machd/test1.txt rename to samples/test-cpp/Resources/Misc/resources-machd/test1.txt diff --git a/samples/TestCpp/Resources/Misc/resources-wide/test5.txt b/samples/test-cpp/Resources/Misc/resources-wide/test5.txt similarity index 100% rename from samples/TestCpp/Resources/Misc/resources-wide/test5.txt rename to samples/test-cpp/Resources/Misc/resources-wide/test5.txt diff --git a/samples/TestCpp/Resources/Misc/resources-widehd/test3.txt b/samples/test-cpp/Resources/Misc/resources-widehd/test3.txt similarity index 100% rename from samples/TestCpp/Resources/Misc/resources-widehd/test3.txt rename to samples/test-cpp/Resources/Misc/resources-widehd/test3.txt diff --git a/samples/TestCpp/Resources/Misc/searchpath1/file1.txt b/samples/test-cpp/Resources/Misc/searchpath1/file1.txt similarity index 100% rename from samples/TestCpp/Resources/Misc/searchpath1/file1.txt rename to samples/test-cpp/Resources/Misc/searchpath1/file1.txt diff --git a/samples/TestCpp/Resources/Misc/searchpath2/resources-ipad/file2.txt b/samples/test-cpp/Resources/Misc/searchpath2/resources-ipad/file2.txt similarity index 100% rename from samples/TestCpp/Resources/Misc/searchpath2/resources-ipad/file2.txt rename to samples/test-cpp/Resources/Misc/searchpath2/resources-ipad/file2.txt diff --git a/samples/TestCpp/Resources/Shaders/example_ColorBars.vsh b/samples/test-cpp/Resources/Shaders/example_ColorBars.vsh similarity index 100% rename from samples/TestCpp/Resources/Shaders/example_ColorBars.vsh rename to samples/test-cpp/Resources/Shaders/example_ColorBars.vsh diff --git a/samples/TestCpp/Resources/Shaders/example_Flower.vsh b/samples/test-cpp/Resources/Shaders/example_Flower.vsh similarity index 100% rename from samples/TestCpp/Resources/Shaders/example_Flower.vsh rename to samples/test-cpp/Resources/Shaders/example_Flower.vsh diff --git a/samples/TestCpp/Resources/Shaders/example_Heart.vsh b/samples/test-cpp/Resources/Shaders/example_Heart.vsh similarity index 100% rename from samples/TestCpp/Resources/Shaders/example_Heart.vsh rename to samples/test-cpp/Resources/Shaders/example_Heart.vsh diff --git a/samples/TestCpp/Resources/Shaders/example_Julia.vsh b/samples/test-cpp/Resources/Shaders/example_Julia.vsh similarity index 100% rename from samples/TestCpp/Resources/Shaders/example_Julia.vsh rename to samples/test-cpp/Resources/Shaders/example_Julia.vsh diff --git a/samples/TestCpp/Resources/Shaders/example_Mandelbrot.vsh b/samples/test-cpp/Resources/Shaders/example_Mandelbrot.vsh similarity index 100% rename from samples/TestCpp/Resources/Shaders/example_Mandelbrot.vsh rename to samples/test-cpp/Resources/Shaders/example_Mandelbrot.vsh diff --git a/samples/TestCpp/Resources/Shaders/example_Monjori.vsh b/samples/test-cpp/Resources/Shaders/example_Monjori.vsh similarity index 100% rename from samples/TestCpp/Resources/Shaders/example_Monjori.vsh rename to samples/test-cpp/Resources/Shaders/example_Monjori.vsh diff --git a/samples/TestCpp/Resources/Shaders/example_Plasma.vsh b/samples/test-cpp/Resources/Shaders/example_Plasma.vsh similarity index 100% rename from samples/TestCpp/Resources/Shaders/example_Plasma.vsh rename to samples/test-cpp/Resources/Shaders/example_Plasma.vsh diff --git a/samples/TestCpp/Resources/Shaders/example_Twist.vsh b/samples/test-cpp/Resources/Shaders/example_Twist.vsh similarity index 100% rename from samples/TestCpp/Resources/Shaders/example_Twist.vsh rename to samples/test-cpp/Resources/Shaders/example_Twist.vsh diff --git a/samples/TestCpp/Resources/TileMaps/hexa-tiles.png.REMOVED.git-id b/samples/test-cpp/Resources/TileMaps/hexa-tiles.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/TileMaps/hexa-tiles.png.REMOVED.git-id rename to samples/test-cpp/Resources/TileMaps/hexa-tiles.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/TileMaps/map/slcj.png.REMOVED.git-id b/samples/test-cpp/Resources/TileMaps/map/slcj.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/TileMaps/map/slcj.png.REMOVED.git-id rename to samples/test-cpp/Resources/TileMaps/map/slcj.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/TileMaps/ortho-test1.png.REMOVED.git-id b/samples/test-cpp/Resources/TileMaps/ortho-test1.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/TileMaps/ortho-test1.png.REMOVED.git-id rename to samples/test-cpp/Resources/TileMaps/ortho-test1.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/TileMaps/ortho-test1_bw.png.REMOVED.git-id b/samples/test-cpp/Resources/TileMaps/ortho-test1_bw.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/TileMaps/ortho-test1_bw.png.REMOVED.git-id rename to samples/test-cpp/Resources/TileMaps/ortho-test1_bw.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/animations/grossini.plist.xml b/samples/test-cpp/Resources/animations/grossini.plist.xml similarity index 100% rename from samples/TestCpp/Resources/animations/grossini.plist.xml rename to samples/test-cpp/Resources/animations/grossini.plist.xml diff --git a/samples/TestCpp/Resources/armature/Cowboy.ExportJson.REMOVED.git-id b/samples/test-cpp/Resources/armature/Cowboy.ExportJson.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/armature/Cowboy.ExportJson.REMOVED.git-id rename to samples/test-cpp/Resources/armature/Cowboy.ExportJson.REMOVED.git-id diff --git a/samples/TestCpp/Resources/armature/Cowboy0.png.REMOVED.git-id b/samples/test-cpp/Resources/armature/Cowboy0.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/armature/Cowboy0.png.REMOVED.git-id rename to samples/test-cpp/Resources/armature/Cowboy0.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/armature/Dragon.xml b/samples/test-cpp/Resources/armature/Dragon.xml similarity index 100% rename from samples/TestCpp/Resources/armature/Dragon.xml rename to samples/test-cpp/Resources/armature/Dragon.xml diff --git a/samples/TestCpp/Resources/armature/HeroAnimation.ExportJson.REMOVED.git-id b/samples/test-cpp/Resources/armature/HeroAnimation.ExportJson.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/armature/HeroAnimation.ExportJson.REMOVED.git-id rename to samples/test-cpp/Resources/armature/HeroAnimation.ExportJson.REMOVED.git-id diff --git a/samples/TestCpp/Resources/armature/cyborg.xml b/samples/test-cpp/Resources/armature/cyborg.xml similarity index 100% rename from samples/TestCpp/Resources/armature/cyborg.xml rename to samples/test-cpp/Resources/armature/cyborg.xml diff --git a/samples/TestCpp/Resources/armature/knight.xml b/samples/test-cpp/Resources/armature/knight.xml similarity index 100% rename from samples/TestCpp/Resources/armature/knight.xml rename to samples/test-cpp/Resources/armature/knight.xml diff --git a/samples/TestCpp/Resources/armature/robot.xml b/samples/test-cpp/Resources/armature/robot.xml similarity index 100% rename from samples/TestCpp/Resources/armature/robot.xml rename to samples/test-cpp/Resources/armature/robot.xml diff --git a/samples/TestCpp/Resources/armature/weapon.xml b/samples/test-cpp/Resources/armature/weapon.xml similarity index 100% rename from samples/TestCpp/Resources/armature/weapon.xml rename to samples/test-cpp/Resources/armature/weapon.xml diff --git a/samples/TestCpp/Resources/background-music-aac.wav.REMOVED.git-id b/samples/test-cpp/Resources/background-music-aac.wav.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/background-music-aac.wav.REMOVED.git-id rename to samples/test-cpp/Resources/background-music-aac.wav.REMOVED.git-id diff --git a/samples/TestCpp/Resources/background.mp3.REMOVED.git-id b/samples/test-cpp/Resources/background.mp3.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/background.mp3.REMOVED.git-id rename to samples/test-cpp/Resources/background.mp3.REMOVED.git-id diff --git a/samples/TestCpp/Resources/ccb/flower.jpg.REMOVED.git-id b/samples/test-cpp/Resources/ccb/flower.jpg.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/ccb/flower.jpg.REMOVED.git-id rename to samples/test-cpp/Resources/ccb/flower.jpg.REMOVED.git-id diff --git a/samples/TestCpp/Resources/ccb/gem-0.wav.REMOVED.git-id b/samples/test-cpp/Resources/ccb/gem-0.wav.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/ccb/gem-0.wav.REMOVED.git-id rename to samples/test-cpp/Resources/ccb/gem-0.wav.REMOVED.git-id diff --git a/samples/TestCpp/Resources/ccb/gem-1.wav.REMOVED.git-id b/samples/test-cpp/Resources/ccb/gem-1.wav.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/ccb/gem-1.wav.REMOVED.git-id rename to samples/test-cpp/Resources/ccb/gem-1.wav.REMOVED.git-id diff --git a/samples/TestCpp/Resources/ccb/markerfelt24shadow.fnt.REMOVED.git-id b/samples/test-cpp/Resources/ccb/markerfelt24shadow.fnt.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/ccb/markerfelt24shadow.fnt.REMOVED.git-id rename to samples/test-cpp/Resources/ccb/markerfelt24shadow.fnt.REMOVED.git-id diff --git a/samples/TestCpp/Resources/cocosgui/Hello.png.REMOVED.git-id b/samples/test-cpp/Resources/cocosgui/Hello.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/cocosgui/Hello.png.REMOVED.git-id rename to samples/test-cpp/Resources/cocosgui/Hello.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/cocosgui/UITest/background.png.REMOVED.git-id b/samples/test-cpp/Resources/cocosgui/UITest/background.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/cocosgui/UITest/background.png.REMOVED.git-id rename to samples/test-cpp/Resources/cocosgui/UITest/background.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/cocosgui/b11.png.REMOVED.git-id b/samples/test-cpp/Resources/cocosgui/b11.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/cocosgui/b11.png.REMOVED.git-id rename to samples/test-cpp/Resources/cocosgui/b11.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/cocosgui/bitmapFontTest2.png.REMOVED.git-id b/samples/test-cpp/Resources/cocosgui/bitmapFontTest2.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/cocosgui/bitmapFontTest2.png.REMOVED.git-id rename to samples/test-cpp/Resources/cocosgui/bitmapFontTest2.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/cocosgui/examples/examples.json.REMOVED.git-id b/samples/test-cpp/Resources/cocosgui/examples/examples.json.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/cocosgui/examples/examples.json.REMOVED.git-id rename to samples/test-cpp/Resources/cocosgui/examples/examples.json.REMOVED.git-id diff --git a/samples/TestCpp/Resources/cocosgui/gui_examples/map_1/map_pve.png.REMOVED.git-id b/samples/test-cpp/Resources/cocosgui/gui_examples/map_1/map_pve.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/cocosgui/gui_examples/map_1/map_pve.png.REMOVED.git-id rename to samples/test-cpp/Resources/cocosgui/gui_examples/map_1/map_pve.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/cocosgui/gui_examples/page_1/background.png.REMOVED.git-id b/samples/test-cpp/Resources/cocosgui/gui_examples/page_1/background.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/cocosgui/gui_examples/page_1/background.png.REMOVED.git-id rename to samples/test-cpp/Resources/cocosgui/gui_examples/page_1/background.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/extensions/background.png.REMOVED.git-id b/samples/test-cpp/Resources/extensions/background.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/extensions/background.png.REMOVED.git-id rename to samples/test-cpp/Resources/extensions/background.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/fonts/Courier New.ttf.REMOVED.git-id b/samples/test-cpp/Resources/fonts/Courier New.ttf.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/fonts/Courier New.ttf.REMOVED.git-id rename to samples/test-cpp/Resources/fonts/Courier New.ttf.REMOVED.git-id diff --git a/samples/TestCpp/Resources/fonts/Thonburi.ttf.REMOVED.git-id b/samples/test-cpp/Resources/fonts/Thonburi.ttf.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/fonts/Thonburi.ttf.REMOVED.git-id rename to samples/test-cpp/Resources/fonts/Thonburi.ttf.REMOVED.git-id diff --git a/samples/TestCpp/Resources/fonts/ThonburiBold.ttf.REMOVED.git-id b/samples/test-cpp/Resources/fonts/ThonburiBold.ttf.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/fonts/ThonburiBold.ttf.REMOVED.git-id rename to samples/test-cpp/Resources/fonts/ThonburiBold.ttf.REMOVED.git-id diff --git a/samples/TestCpp/Resources/fonts/arial-26-en-ru_0.png.REMOVED.git-id b/samples/test-cpp/Resources/fonts/arial-26-en-ru_0.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/fonts/arial-26-en-ru_0.png.REMOVED.git-id rename to samples/test-cpp/Resources/fonts/arial-26-en-ru_0.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/fonts/arial-unicode-26.GlyphProject b/samples/test-cpp/Resources/fonts/arial-unicode-26.GlyphProject similarity index 100% rename from samples/TestCpp/Resources/fonts/arial-unicode-26.GlyphProject rename to samples/test-cpp/Resources/fonts/arial-unicode-26.GlyphProject diff --git a/samples/TestCpp/Resources/fonts/arial-unicode-26.png.REMOVED.git-id b/samples/test-cpp/Resources/fonts/arial-unicode-26.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/fonts/arial-unicode-26.png.REMOVED.git-id rename to samples/test-cpp/Resources/fonts/arial-unicode-26.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/fonts/arial.ttf.REMOVED.git-id b/samples/test-cpp/Resources/fonts/arial.ttf.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/fonts/arial.ttf.REMOVED.git-id rename to samples/test-cpp/Resources/fonts/arial.ttf.REMOVED.git-id diff --git a/samples/TestCpp/Resources/fonts/bitmapFontChinese.png.REMOVED.git-id b/samples/test-cpp/Resources/fonts/bitmapFontChinese.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/fonts/bitmapFontChinese.png.REMOVED.git-id rename to samples/test-cpp/Resources/fonts/bitmapFontChinese.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/fonts/bitmapFontTest.png.REMOVED.git-id b/samples/test-cpp/Resources/fonts/bitmapFontTest.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/fonts/bitmapFontTest.png.REMOVED.git-id rename to samples/test-cpp/Resources/fonts/bitmapFontTest.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/fonts/bitmapFontTest2.bmp.REMOVED.git-id b/samples/test-cpp/Resources/fonts/bitmapFontTest2.bmp.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/fonts/bitmapFontTest2.bmp.REMOVED.git-id rename to samples/test-cpp/Resources/fonts/bitmapFontTest2.bmp.REMOVED.git-id diff --git a/samples/TestCpp/Resources/fonts/bitmapFontTest2.png.REMOVED.git-id b/samples/test-cpp/Resources/fonts/bitmapFontTest2.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/fonts/bitmapFontTest2.png.REMOVED.git-id rename to samples/test-cpp/Resources/fonts/bitmapFontTest2.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/fonts/boundsTestFont.png.REMOVED.git-id b/samples/test-cpp/Resources/fonts/boundsTestFont.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/fonts/boundsTestFont.png.REMOVED.git-id rename to samples/test-cpp/Resources/fonts/boundsTestFont.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/fonts/font-issue1343-hd.png.REMOVED.git-id b/samples/test-cpp/Resources/fonts/font-issue1343-hd.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/fonts/font-issue1343-hd.png.REMOVED.git-id rename to samples/test-cpp/Resources/fonts/font-issue1343-hd.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/fonts/futura-48.png.REMOVED.git-id b/samples/test-cpp/Resources/fonts/futura-48.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/fonts/futura-48.png.REMOVED.git-id rename to samples/test-cpp/Resources/fonts/futura-48.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/fonts/helvetica-geneva-32.png.REMOVED.git-id b/samples/test-cpp/Resources/fonts/helvetica-geneva-32.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/fonts/helvetica-geneva-32.png.REMOVED.git-id rename to samples/test-cpp/Resources/fonts/helvetica-geneva-32.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/fonts/markerFelt.fnt.REMOVED.git-id b/samples/test-cpp/Resources/fonts/markerFelt.fnt.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/fonts/markerFelt.fnt.REMOVED.git-id rename to samples/test-cpp/Resources/fonts/markerFelt.fnt.REMOVED.git-id diff --git a/samples/TestCpp/Resources/fonts/strings.xml b/samples/test-cpp/Resources/fonts/strings.xml similarity index 100% rename from samples/TestCpp/Resources/fonts/strings.xml rename to samples/test-cpp/Resources/fonts/strings.xml diff --git a/samples/TestCpp/Resources/fonts/tahoma.ttf.REMOVED.git-id b/samples/test-cpp/Resources/fonts/tahoma.ttf.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/fonts/tahoma.ttf.REMOVED.git-id rename to samples/test-cpp/Resources/fonts/tahoma.ttf.REMOVED.git-id diff --git a/samples/TestCpp/Resources/fonts/wt021.ttf.REMOVED.git-id b/samples/test-cpp/Resources/fonts/wt021.ttf.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/fonts/wt021.ttf.REMOVED.git-id rename to samples/test-cpp/Resources/fonts/wt021.ttf.REMOVED.git-id diff --git a/samples/TestCpp/Resources/hd/Images/background1.png.REMOVED.git-id b/samples/test-cpp/Resources/hd/Images/background1.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/hd/Images/background1.png.REMOVED.git-id rename to samples/test-cpp/Resources/hd/Images/background1.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/hd/Images/background2.jpg.REMOVED.git-id b/samples/test-cpp/Resources/hd/Images/background2.jpg.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/hd/Images/background2.jpg.REMOVED.git-id rename to samples/test-cpp/Resources/hd/Images/background2.jpg.REMOVED.git-id diff --git a/samples/TestCpp/Resources/hd/Images/background2.png.REMOVED.git-id b/samples/test-cpp/Resources/hd/Images/background2.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/hd/Images/background2.png.REMOVED.git-id rename to samples/test-cpp/Resources/hd/Images/background2.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/hd/armature/Cowboy0.png.REMOVED.git-id b/samples/test-cpp/Resources/hd/armature/Cowboy0.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/hd/armature/Cowboy0.png.REMOVED.git-id rename to samples/test-cpp/Resources/hd/armature/Cowboy0.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/hd/armature/Dragon.png.REMOVED.git-id b/samples/test-cpp/Resources/hd/armature/Dragon.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/hd/armature/Dragon.png.REMOVED.git-id rename to samples/test-cpp/Resources/hd/armature/Dragon.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/hd/armature/HeroAnimation0.png.REMOVED.git-id b/samples/test-cpp/Resources/hd/armature/HeroAnimation0.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/hd/armature/HeroAnimation0.png.REMOVED.git-id rename to samples/test-cpp/Resources/hd/armature/HeroAnimation0.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/hd/armature/weapon.png.REMOVED.git-id b/samples/test-cpp/Resources/hd/armature/weapon.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/hd/armature/weapon.png.REMOVED.git-id rename to samples/test-cpp/Resources/hd/armature/weapon.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/hd/ccb/burst.png.REMOVED.git-id b/samples/test-cpp/Resources/hd/ccb/burst.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/hd/ccb/burst.png.REMOVED.git-id rename to samples/test-cpp/Resources/hd/ccb/burst.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/hd/cocosgui/Hello.png.REMOVED.git-id b/samples/test-cpp/Resources/hd/cocosgui/Hello.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/hd/cocosgui/Hello.png.REMOVED.git-id rename to samples/test-cpp/Resources/hd/cocosgui/Hello.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/hd/cocosgui/UITest/background.png.REMOVED.git-id b/samples/test-cpp/Resources/hd/cocosgui/UITest/background.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/hd/cocosgui/UITest/background.png.REMOVED.git-id rename to samples/test-cpp/Resources/hd/cocosgui/UITest/background.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/hd/cocosgui/b11.png.REMOVED.git-id b/samples/test-cpp/Resources/hd/cocosgui/b11.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/hd/cocosgui/b11.png.REMOVED.git-id rename to samples/test-cpp/Resources/hd/cocosgui/b11.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/hd/cocosgui/bitmapFontTest2.png.REMOVED.git-id b/samples/test-cpp/Resources/hd/cocosgui/bitmapFontTest2.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/hd/cocosgui/bitmapFontTest2.png.REMOVED.git-id rename to samples/test-cpp/Resources/hd/cocosgui/bitmapFontTest2.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/hd/cocosgui/examples/examples.json.REMOVED.git-id b/samples/test-cpp/Resources/hd/cocosgui/examples/examples.json.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/hd/cocosgui/examples/examples.json.REMOVED.git-id rename to samples/test-cpp/Resources/hd/cocosgui/examples/examples.json.REMOVED.git-id diff --git a/samples/TestCpp/Resources/hd/cocosgui/gui_examples/map_1/map_pve.png.REMOVED.git-id b/samples/test-cpp/Resources/hd/cocosgui/gui_examples/map_1/map_pve.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/hd/cocosgui/gui_examples/map_1/map_pve.png.REMOVED.git-id rename to samples/test-cpp/Resources/hd/cocosgui/gui_examples/map_1/map_pve.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/hd/cocosgui/gui_examples/page_1/background.png.REMOVED.git-id b/samples/test-cpp/Resources/hd/cocosgui/gui_examples/page_1/background.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/hd/cocosgui/gui_examples/page_1/background.png.REMOVED.git-id rename to samples/test-cpp/Resources/hd/cocosgui/gui_examples/page_1/background.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/hd/extensions/background.png.REMOVED.git-id b/samples/test-cpp/Resources/hd/extensions/background.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/hd/extensions/background.png.REMOVED.git-id rename to samples/test-cpp/Resources/hd/extensions/background.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/hd/fonts/font-issue1343.png.REMOVED.git-id b/samples/test-cpp/Resources/hd/fonts/font-issue1343.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/hd/fonts/font-issue1343.png.REMOVED.git-id rename to samples/test-cpp/Resources/hd/fonts/font-issue1343.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/hd/fonts/markerFelt.fnt.REMOVED.git-id b/samples/test-cpp/Resources/hd/fonts/markerFelt.fnt.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/hd/fonts/markerFelt.fnt.REMOVED.git-id rename to samples/test-cpp/Resources/hd/fonts/markerFelt.fnt.REMOVED.git-id diff --git a/samples/TestCpp/Resources/hd/fonts/markerFelt.png.REMOVED.git-id b/samples/test-cpp/Resources/hd/fonts/markerFelt.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/hd/fonts/markerFelt.png.REMOVED.git-id rename to samples/test-cpp/Resources/hd/fonts/markerFelt.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/hd/fonts/tuffy_bold_italic-charmap.png.REMOVED.git-id b/samples/test-cpp/Resources/hd/fonts/tuffy_bold_italic-charmap.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/hd/fonts/tuffy_bold_italic-charmap.png.REMOVED.git-id rename to samples/test-cpp/Resources/hd/fonts/tuffy_bold_italic-charmap.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/hd/scenetest/ArmatureComponentTest/Images/startMenuBG.png.REMOVED.git-id b/samples/test-cpp/Resources/hd/scenetest/ArmatureComponentTest/Images/startMenuBG.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/hd/scenetest/ArmatureComponentTest/Images/startMenuBG.png.REMOVED.git-id rename to samples/test-cpp/Resources/hd/scenetest/ArmatureComponentTest/Images/startMenuBG.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/hd/scenetest/ArmatureComponentTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id b/samples/test-cpp/Resources/hd/scenetest/ArmatureComponentTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/hd/scenetest/ArmatureComponentTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id rename to samples/test-cpp/Resources/hd/scenetest/ArmatureComponentTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/hd/scenetest/ArmatureComponentTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id b/samples/test-cpp/Resources/hd/scenetest/ArmatureComponentTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/hd/scenetest/ArmatureComponentTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id rename to samples/test-cpp/Resources/hd/scenetest/ArmatureComponentTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/hd/scenetest/BackgroundComponentTest/Images/startMenuBG.png.REMOVED.git-id b/samples/test-cpp/Resources/hd/scenetest/BackgroundComponentTest/Images/startMenuBG.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/hd/scenetest/BackgroundComponentTest/Images/startMenuBG.png.REMOVED.git-id rename to samples/test-cpp/Resources/hd/scenetest/BackgroundComponentTest/Images/startMenuBG.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/hd/scenetest/BackgroundComponentTest/Misc/music_logo.mp3.REMOVED.git-id b/samples/test-cpp/Resources/hd/scenetest/BackgroundComponentTest/Misc/music_logo.mp3.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/hd/scenetest/BackgroundComponentTest/Misc/music_logo.mp3.REMOVED.git-id rename to samples/test-cpp/Resources/hd/scenetest/BackgroundComponentTest/Misc/music_logo.mp3.REMOVED.git-id diff --git a/samples/TestCpp/Resources/hd/scenetest/BackgroundComponentTest/Misc/music_logo.wav.REMOVED.git-id b/samples/test-cpp/Resources/hd/scenetest/BackgroundComponentTest/Misc/music_logo.wav.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/hd/scenetest/BackgroundComponentTest/Misc/music_logo.wav.REMOVED.git-id rename to samples/test-cpp/Resources/hd/scenetest/BackgroundComponentTest/Misc/music_logo.wav.REMOVED.git-id diff --git a/samples/TestCpp/Resources/hd/scenetest/BackgroundComponentTest/startMenu/Fish_UI/starMenuButton01.png.REMOVED.git-id b/samples/test-cpp/Resources/hd/scenetest/BackgroundComponentTest/startMenu/Fish_UI/starMenuButton01.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/hd/scenetest/BackgroundComponentTest/startMenu/Fish_UI/starMenuButton01.png.REMOVED.git-id rename to samples/test-cpp/Resources/hd/scenetest/BackgroundComponentTest/startMenu/Fish_UI/starMenuButton01.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/hd/scenetest/BackgroundComponentTest/startMenu/Fish_UI/starMenuButton02.png.REMOVED.git-id b/samples/test-cpp/Resources/hd/scenetest/BackgroundComponentTest/startMenu/Fish_UI/starMenuButton02.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/hd/scenetest/BackgroundComponentTest/startMenu/Fish_UI/starMenuButton02.png.REMOVED.git-id rename to samples/test-cpp/Resources/hd/scenetest/BackgroundComponentTest/startMenu/Fish_UI/starMenuButton02.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/hd/scenetest/BackgroundComponentTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id b/samples/test-cpp/Resources/hd/scenetest/BackgroundComponentTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/hd/scenetest/BackgroundComponentTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id rename to samples/test-cpp/Resources/hd/scenetest/BackgroundComponentTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/hd/scenetest/EffectComponentTest/CowBoy/Cowboy.ExportJson.REMOVED.git-id b/samples/test-cpp/Resources/hd/scenetest/EffectComponentTest/CowBoy/Cowboy.ExportJson.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/hd/scenetest/EffectComponentTest/CowBoy/Cowboy.ExportJson.REMOVED.git-id rename to samples/test-cpp/Resources/hd/scenetest/EffectComponentTest/CowBoy/Cowboy.ExportJson.REMOVED.git-id diff --git a/samples/TestCpp/Resources/hd/scenetest/EffectComponentTest/CowBoy/Cowboy0.png.REMOVED.git-id b/samples/test-cpp/Resources/hd/scenetest/EffectComponentTest/CowBoy/Cowboy0.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/hd/scenetest/EffectComponentTest/CowBoy/Cowboy0.png.REMOVED.git-id rename to samples/test-cpp/Resources/hd/scenetest/EffectComponentTest/CowBoy/Cowboy0.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/Images/startMenuBG.png.REMOVED.git-id b/samples/test-cpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/Images/startMenuBG.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/Images/startMenuBG.png.REMOVED.git-id rename to samples/test-cpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/Images/startMenuBG.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.mp3.REMOVED.git-id b/samples/test-cpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.mp3.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.mp3.REMOVED.git-id rename to samples/test-cpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.mp3.REMOVED.git-id diff --git a/samples/TestCpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.wav.REMOVED.git-id b/samples/test-cpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.wav.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.wav.REMOVED.git-id rename to samples/test-cpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.wav.REMOVED.git-id diff --git a/samples/TestCpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id b/samples/test-cpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id rename to samples/test-cpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id b/samples/test-cpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id rename to samples/test-cpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/starMenuButton01.png.REMOVED.git-id b/samples/test-cpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/starMenuButton01.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/starMenuButton01.png.REMOVED.git-id rename to samples/test-cpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/starMenuButton01.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/starMenuButton02.png.REMOVED.git-id b/samples/test-cpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/starMenuButton02.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/starMenuButton02.png.REMOVED.git-id rename to samples/test-cpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/starMenuButton02.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id b/samples/test-cpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id rename to samples/test-cpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/hd/scenetest/TriggerTest/Images/startMenuBG.png.REMOVED.git-id b/samples/test-cpp/Resources/hd/scenetest/TriggerTest/Images/startMenuBG.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/hd/scenetest/TriggerTest/Images/startMenuBG.png.REMOVED.git-id rename to samples/test-cpp/Resources/hd/scenetest/TriggerTest/Images/startMenuBG.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/hd/scenetest/TriggerTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id b/samples/test-cpp/Resources/hd/scenetest/TriggerTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/hd/scenetest/TriggerTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id rename to samples/test-cpp/Resources/hd/scenetest/TriggerTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/hd/scenetest/TriggerTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id b/samples/test-cpp/Resources/hd/scenetest/TriggerTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/hd/scenetest/TriggerTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id rename to samples/test-cpp/Resources/hd/scenetest/TriggerTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/hd/scenetest/UIComponentTest/Images/startMenuBG.png.REMOVED.git-id b/samples/test-cpp/Resources/hd/scenetest/UIComponentTest/Images/startMenuBG.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/hd/scenetest/UIComponentTest/Images/startMenuBG.png.REMOVED.git-id rename to samples/test-cpp/Resources/hd/scenetest/UIComponentTest/Images/startMenuBG.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/hd/scenetest/UIComponentTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id b/samples/test-cpp/Resources/hd/scenetest/UIComponentTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/hd/scenetest/UIComponentTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id rename to samples/test-cpp/Resources/hd/scenetest/UIComponentTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/hd/scenetest/UIComponentTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id b/samples/test-cpp/Resources/hd/scenetest/UIComponentTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/hd/scenetest/UIComponentTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id rename to samples/test-cpp/Resources/hd/scenetest/UIComponentTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/hd/spine/goblins.png.REMOVED.git-id b/samples/test-cpp/Resources/hd/spine/goblins.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/hd/spine/goblins.png.REMOVED.git-id rename to samples/test-cpp/Resources/hd/spine/goblins.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/hd/spine/spineboy.png.REMOVED.git-id b/samples/test-cpp/Resources/hd/spine/spineboy.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/hd/spine/spineboy.png.REMOVED.git-id rename to samples/test-cpp/Resources/hd/spine/spineboy.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/ipad/ccb/burst.png.REMOVED.git-id b/samples/test-cpp/Resources/ipad/ccb/burst.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/ipad/ccb/burst.png.REMOVED.git-id rename to samples/test-cpp/Resources/ipad/ccb/burst.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/ipad/extensions/background.png.REMOVED.git-id b/samples/test-cpp/Resources/ipad/extensions/background.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/ipad/extensions/background.png.REMOVED.git-id rename to samples/test-cpp/Resources/ipad/extensions/background.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/scenetest/ArmatureComponentTest/Images/startMenuBG.png.REMOVED.git-id b/samples/test-cpp/Resources/scenetest/ArmatureComponentTest/Images/startMenuBG.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/scenetest/ArmatureComponentTest/Images/startMenuBG.png.REMOVED.git-id rename to samples/test-cpp/Resources/scenetest/ArmatureComponentTest/Images/startMenuBG.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/scenetest/ArmatureComponentTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id b/samples/test-cpp/Resources/scenetest/ArmatureComponentTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/scenetest/ArmatureComponentTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id rename to samples/test-cpp/Resources/scenetest/ArmatureComponentTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/scenetest/ArmatureComponentTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id b/samples/test-cpp/Resources/scenetest/ArmatureComponentTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/scenetest/ArmatureComponentTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id rename to samples/test-cpp/Resources/scenetest/ArmatureComponentTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/scenetest/BackgroundComponentTest/Images/startMenuBG.png.REMOVED.git-id b/samples/test-cpp/Resources/scenetest/BackgroundComponentTest/Images/startMenuBG.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/scenetest/BackgroundComponentTest/Images/startMenuBG.png.REMOVED.git-id rename to samples/test-cpp/Resources/scenetest/BackgroundComponentTest/Images/startMenuBG.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/scenetest/BackgroundComponentTest/Misc/music_logo.mp3.REMOVED.git-id b/samples/test-cpp/Resources/scenetest/BackgroundComponentTest/Misc/music_logo.mp3.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/scenetest/BackgroundComponentTest/Misc/music_logo.mp3.REMOVED.git-id rename to samples/test-cpp/Resources/scenetest/BackgroundComponentTest/Misc/music_logo.mp3.REMOVED.git-id diff --git a/samples/TestCpp/Resources/scenetest/BackgroundComponentTest/Misc/music_logo.wav.REMOVED.git-id b/samples/test-cpp/Resources/scenetest/BackgroundComponentTest/Misc/music_logo.wav.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/scenetest/BackgroundComponentTest/Misc/music_logo.wav.REMOVED.git-id rename to samples/test-cpp/Resources/scenetest/BackgroundComponentTest/Misc/music_logo.wav.REMOVED.git-id diff --git a/samples/TestCpp/Resources/scenetest/BackgroundComponentTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id b/samples/test-cpp/Resources/scenetest/BackgroundComponentTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/scenetest/BackgroundComponentTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id rename to samples/test-cpp/Resources/scenetest/BackgroundComponentTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/scenetest/EffectComponentTest/CowBoy/Cowboy.ExportJson.REMOVED.git-id b/samples/test-cpp/Resources/scenetest/EffectComponentTest/CowBoy/Cowboy.ExportJson.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/scenetest/EffectComponentTest/CowBoy/Cowboy.ExportJson.REMOVED.git-id rename to samples/test-cpp/Resources/scenetest/EffectComponentTest/CowBoy/Cowboy.ExportJson.REMOVED.git-id diff --git a/samples/TestCpp/Resources/scenetest/EffectComponentTest/CowBoy/Cowboy0.png.REMOVED.git-id b/samples/test-cpp/Resources/scenetest/EffectComponentTest/CowBoy/Cowboy0.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/scenetest/EffectComponentTest/CowBoy/Cowboy0.png.REMOVED.git-id rename to samples/test-cpp/Resources/scenetest/EffectComponentTest/CowBoy/Cowboy0.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/scenetest/LoadSceneEdtiorFileTest/Images/startMenuBG.png.REMOVED.git-id b/samples/test-cpp/Resources/scenetest/LoadSceneEdtiorFileTest/Images/startMenuBG.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/scenetest/LoadSceneEdtiorFileTest/Images/startMenuBG.png.REMOVED.git-id rename to samples/test-cpp/Resources/scenetest/LoadSceneEdtiorFileTest/Images/startMenuBG.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.mp3.REMOVED.git-id b/samples/test-cpp/Resources/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.mp3.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.mp3.REMOVED.git-id rename to samples/test-cpp/Resources/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.mp3.REMOVED.git-id diff --git a/samples/TestCpp/Resources/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.wav.REMOVED.git-id b/samples/test-cpp/Resources/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.wav.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.wav.REMOVED.git-id rename to samples/test-cpp/Resources/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.wav.REMOVED.git-id diff --git a/samples/TestCpp/Resources/scenetest/LoadSceneEdtiorFileTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id b/samples/test-cpp/Resources/scenetest/LoadSceneEdtiorFileTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/scenetest/LoadSceneEdtiorFileTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id rename to samples/test-cpp/Resources/scenetest/LoadSceneEdtiorFileTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/scenetest/LoadSceneEdtiorFileTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id b/samples/test-cpp/Resources/scenetest/LoadSceneEdtiorFileTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/scenetest/LoadSceneEdtiorFileTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id rename to samples/test-cpp/Resources/scenetest/LoadSceneEdtiorFileTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id b/samples/test-cpp/Resources/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id rename to samples/test-cpp/Resources/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/scenetest/TriggerTest/Images/startMenuBG.png.REMOVED.git-id b/samples/test-cpp/Resources/scenetest/TriggerTest/Images/startMenuBG.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/scenetest/TriggerTest/Images/startMenuBG.png.REMOVED.git-id rename to samples/test-cpp/Resources/scenetest/TriggerTest/Images/startMenuBG.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/scenetest/TriggerTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id b/samples/test-cpp/Resources/scenetest/TriggerTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/scenetest/TriggerTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id rename to samples/test-cpp/Resources/scenetest/TriggerTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/scenetest/TriggerTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id b/samples/test-cpp/Resources/scenetest/TriggerTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/scenetest/TriggerTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id rename to samples/test-cpp/Resources/scenetest/TriggerTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/scenetest/UIComponentTest/Images/startMenuBG.png.REMOVED.git-id b/samples/test-cpp/Resources/scenetest/UIComponentTest/Images/startMenuBG.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/scenetest/UIComponentTest/Images/startMenuBG.png.REMOVED.git-id rename to samples/test-cpp/Resources/scenetest/UIComponentTest/Images/startMenuBG.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/scenetest/UIComponentTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id b/samples/test-cpp/Resources/scenetest/UIComponentTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/scenetest/UIComponentTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id rename to samples/test-cpp/Resources/scenetest/UIComponentTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/scenetest/UIComponentTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id b/samples/test-cpp/Resources/scenetest/UIComponentTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/scenetest/UIComponentTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id rename to samples/test-cpp/Resources/scenetest/UIComponentTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id diff --git a/samples/TestCpp/Resources/spine/goblins.png.REMOVED.git-id b/samples/test-cpp/Resources/spine/goblins.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/Resources/spine/goblins.png.REMOVED.git-id rename to samples/test-cpp/Resources/spine/goblins.png.REMOVED.git-id diff --git a/samples/TestCpp/proj.android/.classpath b/samples/test-cpp/proj.android/.classpath similarity index 100% rename from samples/TestCpp/proj.android/.classpath rename to samples/test-cpp/proj.android/.classpath diff --git a/samples/TestCpp/proj.android/.externalToolBuilders/Javah_jni_builder.launch b/samples/test-cpp/proj.android/.externalToolBuilders/Javah_jni_builder.launch similarity index 100% rename from samples/TestCpp/proj.android/.externalToolBuilders/Javah_jni_builder.launch rename to samples/test-cpp/proj.android/.externalToolBuilders/Javah_jni_builder.launch diff --git a/samples/TestCpp/proj.android/.project b/samples/test-cpp/proj.android/.project similarity index 100% rename from samples/TestCpp/proj.android/.project rename to samples/test-cpp/proj.android/.project diff --git a/samples/TestCpp/proj.android/.settings/org.eclipse.cdt.codan.core.prefs b/samples/test-cpp/proj.android/.settings/org.eclipse.cdt.codan.core.prefs similarity index 100% rename from samples/TestCpp/proj.android/.settings/org.eclipse.cdt.codan.core.prefs rename to samples/test-cpp/proj.android/.settings/org.eclipse.cdt.codan.core.prefs diff --git a/samples/TestCpp/proj.android/AndroidManifest.xml b/samples/test-cpp/proj.android/AndroidManifest.xml similarity index 100% rename from samples/TestCpp/proj.android/AndroidManifest.xml rename to samples/test-cpp/proj.android/AndroidManifest.xml diff --git a/samples/TestCpp/proj.android/README.md b/samples/test-cpp/proj.android/README.md similarity index 100% rename from samples/TestCpp/proj.android/README.md rename to samples/test-cpp/proj.android/README.md diff --git a/samples/TestCpp/proj.android/ant.properties b/samples/test-cpp/proj.android/ant.properties similarity index 100% rename from samples/TestCpp/proj.android/ant.properties rename to samples/test-cpp/proj.android/ant.properties diff --git a/samples/TestCpp/proj.android/build.xml b/samples/test-cpp/proj.android/build.xml similarity index 100% rename from samples/TestCpp/proj.android/build.xml rename to samples/test-cpp/proj.android/build.xml diff --git a/samples/TestCpp/proj.android/jni/Android.mk b/samples/test-cpp/proj.android/jni/Android.mk similarity index 100% rename from samples/TestCpp/proj.android/jni/Android.mk rename to samples/test-cpp/proj.android/jni/Android.mk diff --git a/samples/TestCpp/proj.android/jni/Application.mk b/samples/test-cpp/proj.android/jni/Application.mk similarity index 100% rename from samples/TestCpp/proj.android/jni/Application.mk rename to samples/test-cpp/proj.android/jni/Application.mk diff --git a/samples/TestCpp/proj.android/jni/testcpp/main.cpp b/samples/test-cpp/proj.android/jni/testcpp/main.cpp similarity index 100% rename from samples/TestCpp/proj.android/jni/testcpp/main.cpp rename to samples/test-cpp/proj.android/jni/testcpp/main.cpp diff --git a/samples/TestCpp/proj.android/ndkgdb.sh b/samples/test-cpp/proj.android/ndkgdb.sh similarity index 100% rename from samples/TestCpp/proj.android/ndkgdb.sh rename to samples/test-cpp/proj.android/ndkgdb.sh diff --git a/samples/TestCpp/proj.android/proguard-project.txt b/samples/test-cpp/proj.android/proguard-project.txt similarity index 100% rename from samples/TestCpp/proj.android/proguard-project.txt rename to samples/test-cpp/proj.android/proguard-project.txt diff --git a/samples/TestCpp/proj.android/project.properties b/samples/test-cpp/proj.android/project.properties similarity index 100% rename from samples/TestCpp/proj.android/project.properties rename to samples/test-cpp/proj.android/project.properties diff --git a/samples/TestCpp/proj.android/res/values/strings.xml b/samples/test-cpp/proj.android/res/values/strings.xml similarity index 100% rename from samples/TestCpp/proj.android/res/values/strings.xml rename to samples/test-cpp/proj.android/res/values/strings.xml diff --git a/samples/TestCpp/proj.android/src/nojava.txt b/samples/test-cpp/proj.android/src/nojava.txt similarity index 100% rename from samples/TestCpp/proj.android/src/nojava.txt rename to samples/test-cpp/proj.android/src/nojava.txt diff --git a/samples/TestCpp/proj.android/src/org/cocos2dx/testcpp/Cocos2dxActivity.java b/samples/test-cpp/proj.android/src/org/cocos2dx/testcpp/Cocos2dxActivity.java similarity index 100% rename from samples/TestCpp/proj.android/src/org/cocos2dx/testcpp/Cocos2dxActivity.java rename to samples/test-cpp/proj.android/src/org/cocos2dx/testcpp/Cocos2dxActivity.java diff --git a/samples/TestCpp/proj.ios/Classes/RootViewController.h b/samples/test-cpp/proj.ios/Classes/RootViewController.h similarity index 100% rename from samples/TestCpp/proj.ios/Classes/RootViewController.h rename to samples/test-cpp/proj.ios/Classes/RootViewController.h diff --git a/samples/TestCpp/proj.ios/Classes/RootViewController.mm b/samples/test-cpp/proj.ios/Classes/RootViewController.mm similarity index 100% rename from samples/TestCpp/proj.ios/Classes/RootViewController.mm rename to samples/test-cpp/proj.ios/Classes/RootViewController.mm diff --git a/samples/TestCpp/proj.ios/Classes/testsAppDelegate.h b/samples/test-cpp/proj.ios/Classes/testsAppDelegate.h similarity index 100% rename from samples/TestCpp/proj.ios/Classes/testsAppDelegate.h rename to samples/test-cpp/proj.ios/Classes/testsAppDelegate.h diff --git a/samples/TestCpp/proj.ios/Classes/testsAppDelegate.mm b/samples/test-cpp/proj.ios/Classes/testsAppDelegate.mm similarity index 100% rename from samples/TestCpp/proj.ios/Classes/testsAppDelegate.mm rename to samples/test-cpp/proj.ios/Classes/testsAppDelegate.mm diff --git a/samples/TestCpp/proj.ios/Default-568h@2x.png.REMOVED.git-id b/samples/test-cpp/proj.ios/Default-568h@2x.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/proj.ios/Default-568h@2x.png.REMOVED.git-id rename to samples/test-cpp/proj.ios/Default-568h@2x.png.REMOVED.git-id diff --git a/samples/TestCpp/proj.ios/Default@2x.png.REMOVED.git-id b/samples/test-cpp/proj.ios/Default@2x.png.REMOVED.git-id similarity index 100% rename from samples/TestCpp/proj.ios/Default@2x.png.REMOVED.git-id rename to samples/test-cpp/proj.ios/Default@2x.png.REMOVED.git-id diff --git a/samples/TestCpp/proj.ios/iphone_Prefix.pch b/samples/test-cpp/proj.ios/iphone_Prefix.pch similarity index 100% rename from samples/TestCpp/proj.ios/iphone_Prefix.pch rename to samples/test-cpp/proj.ios/iphone_Prefix.pch diff --git a/samples/TestCpp/proj.ios/main.m b/samples/test-cpp/proj.ios/main.m similarity index 100% rename from samples/TestCpp/proj.ios/main.m rename to samples/test-cpp/proj.ios/main.m diff --git a/samples/TestCpp/proj.linux/main.cpp b/samples/test-cpp/proj.linux/main.cpp similarity index 100% rename from samples/TestCpp/proj.linux/main.cpp rename to samples/test-cpp/proj.linux/main.cpp diff --git a/samples/TestCpp/proj.mac/Icon.icns.REMOVED.git-id b/samples/test-cpp/proj.mac/Icon.icns.REMOVED.git-id similarity index 100% rename from samples/TestCpp/proj.mac/Icon.icns.REMOVED.git-id rename to samples/test-cpp/proj.mac/Icon.icns.REMOVED.git-id diff --git a/samples/TestCpp/proj.mac/Test_Prefix.pch b/samples/test-cpp/proj.mac/Test_Prefix.pch similarity index 100% rename from samples/TestCpp/proj.mac/Test_Prefix.pch rename to samples/test-cpp/proj.mac/Test_Prefix.pch diff --git a/samples/TestCpp/proj.mac/en.lproj/InfoPlist.strings b/samples/test-cpp/proj.mac/en.lproj/InfoPlist.strings similarity index 100% rename from samples/TestCpp/proj.mac/en.lproj/InfoPlist.strings rename to samples/test-cpp/proj.mac/en.lproj/InfoPlist.strings diff --git a/samples/TestCpp/proj.mac/en.lproj/MainMenu.xib b/samples/test-cpp/proj.mac/en.lproj/MainMenu.xib similarity index 100% rename from samples/TestCpp/proj.mac/en.lproj/MainMenu.xib rename to samples/test-cpp/proj.mac/en.lproj/MainMenu.xib diff --git a/samples/TestCpp/proj.mac/main.cpp b/samples/test-cpp/proj.mac/main.cpp similarity index 100% rename from samples/TestCpp/proj.mac/main.cpp rename to samples/test-cpp/proj.mac/main.cpp diff --git a/samples/TestCpp/proj.win32/TestCpp.vcxproj b/samples/test-cpp/proj.win32/TestCpp.vcxproj similarity index 100% rename from samples/TestCpp/proj.win32/TestCpp.vcxproj rename to samples/test-cpp/proj.win32/TestCpp.vcxproj diff --git a/samples/TestCpp/proj.win32/TestCpp.vcxproj.filters b/samples/test-cpp/proj.win32/TestCpp.vcxproj.filters similarity index 100% rename from samples/TestCpp/proj.win32/TestCpp.vcxproj.filters rename to samples/test-cpp/proj.win32/TestCpp.vcxproj.filters diff --git a/samples/TestCpp/proj.win32/TestCpp.vcxproj.user b/samples/test-cpp/proj.win32/TestCpp.vcxproj.user similarity index 100% rename from samples/TestCpp/proj.win32/TestCpp.vcxproj.user rename to samples/test-cpp/proj.win32/TestCpp.vcxproj.user diff --git a/samples/TestCpp/proj.win32/main.cpp b/samples/test-cpp/proj.win32/main.cpp similarity index 100% rename from samples/TestCpp/proj.win32/main.cpp rename to samples/test-cpp/proj.win32/main.cpp diff --git a/samples/TestCpp/proj.win32/main.h b/samples/test-cpp/proj.win32/main.h similarity index 100% rename from samples/TestCpp/proj.win32/main.h rename to samples/test-cpp/proj.win32/main.h diff --git a/samples/TestJavascript/Classes/AppDelegate.cpp b/samples/test-javascript/Classes/AppDelegate.cpp similarity index 100% rename from samples/TestJavascript/Classes/AppDelegate.cpp rename to samples/test-javascript/Classes/AppDelegate.cpp diff --git a/samples/TestJavascript/Classes/AppDelegate.h b/samples/test-javascript/Classes/AppDelegate.h similarity index 100% rename from samples/TestJavascript/Classes/AppDelegate.h rename to samples/test-javascript/Classes/AppDelegate.h diff --git a/samples/TestJavascript/proj.android/.classpath b/samples/test-javascript/proj.android/.classpath similarity index 100% rename from samples/TestJavascript/proj.android/.classpath rename to samples/test-javascript/proj.android/.classpath diff --git a/samples/TestJavascript/proj.android/.project b/samples/test-javascript/proj.android/.project similarity index 100% rename from samples/TestJavascript/proj.android/.project rename to samples/test-javascript/proj.android/.project diff --git a/samples/TestJavascript/proj.android/.settings/.jsdtscope b/samples/test-javascript/proj.android/.settings/.jsdtscope similarity index 100% rename from samples/TestJavascript/proj.android/.settings/.jsdtscope rename to samples/test-javascript/proj.android/.settings/.jsdtscope diff --git a/samples/TestJavascript/proj.android/.settings/org.eclipse.cdt.codan.core.prefs b/samples/test-javascript/proj.android/.settings/org.eclipse.cdt.codan.core.prefs similarity index 100% rename from samples/TestJavascript/proj.android/.settings/org.eclipse.cdt.codan.core.prefs rename to samples/test-javascript/proj.android/.settings/org.eclipse.cdt.codan.core.prefs diff --git a/samples/TestJavascript/proj.android/.settings/org.eclipse.wst.jsdt.ui.prefs b/samples/test-javascript/proj.android/.settings/org.eclipse.wst.jsdt.ui.prefs similarity index 100% rename from samples/TestJavascript/proj.android/.settings/org.eclipse.wst.jsdt.ui.prefs rename to samples/test-javascript/proj.android/.settings/org.eclipse.wst.jsdt.ui.prefs diff --git a/samples/TestJavascript/proj.android/.settings/org.eclipse.wst.jsdt.ui.superType.container b/samples/test-javascript/proj.android/.settings/org.eclipse.wst.jsdt.ui.superType.container similarity index 100% rename from samples/TestJavascript/proj.android/.settings/org.eclipse.wst.jsdt.ui.superType.container rename to samples/test-javascript/proj.android/.settings/org.eclipse.wst.jsdt.ui.superType.container diff --git a/samples/TestJavascript/proj.android/.settings/org.eclipse.wst.jsdt.ui.superType.name b/samples/test-javascript/proj.android/.settings/org.eclipse.wst.jsdt.ui.superType.name similarity index 100% rename from samples/TestJavascript/proj.android/.settings/org.eclipse.wst.jsdt.ui.superType.name rename to samples/test-javascript/proj.android/.settings/org.eclipse.wst.jsdt.ui.superType.name diff --git a/samples/TestJavascript/proj.android/AndroidManifest.xml b/samples/test-javascript/proj.android/AndroidManifest.xml similarity index 100% rename from samples/TestJavascript/proj.android/AndroidManifest.xml rename to samples/test-javascript/proj.android/AndroidManifest.xml diff --git a/samples/TestJavascript/proj.android/README.md b/samples/test-javascript/proj.android/README.md similarity index 100% rename from samples/TestJavascript/proj.android/README.md rename to samples/test-javascript/proj.android/README.md diff --git a/samples/TestJavascript/proj.android/ant.properties b/samples/test-javascript/proj.android/ant.properties similarity index 100% rename from samples/TestJavascript/proj.android/ant.properties rename to samples/test-javascript/proj.android/ant.properties diff --git a/samples/TestJavascript/proj.android/build.xml b/samples/test-javascript/proj.android/build.xml similarity index 100% rename from samples/TestJavascript/proj.android/build.xml rename to samples/test-javascript/proj.android/build.xml diff --git a/samples/TestJavascript/proj.android/jni/Android.mk b/samples/test-javascript/proj.android/jni/Android.mk similarity index 100% rename from samples/TestJavascript/proj.android/jni/Android.mk rename to samples/test-javascript/proj.android/jni/Android.mk diff --git a/samples/TestJavascript/proj.android/jni/Application.mk b/samples/test-javascript/proj.android/jni/Application.mk similarity index 100% rename from samples/TestJavascript/proj.android/jni/Application.mk rename to samples/test-javascript/proj.android/jni/Application.mk diff --git a/samples/TestJavascript/proj.android/jni/testjavascript/main.cpp b/samples/test-javascript/proj.android/jni/testjavascript/main.cpp similarity index 100% rename from samples/TestJavascript/proj.android/jni/testjavascript/main.cpp rename to samples/test-javascript/proj.android/jni/testjavascript/main.cpp diff --git a/samples/TestJavascript/proj.android/ndkgdb.sh b/samples/test-javascript/proj.android/ndkgdb.sh similarity index 100% rename from samples/TestJavascript/proj.android/ndkgdb.sh rename to samples/test-javascript/proj.android/ndkgdb.sh diff --git a/samples/TestJavascript/proj.android/proguard-project.txt b/samples/test-javascript/proj.android/proguard-project.txt similarity index 100% rename from samples/TestJavascript/proj.android/proguard-project.txt rename to samples/test-javascript/proj.android/proguard-project.txt diff --git a/samples/TestJavascript/proj.android/project.properties b/samples/test-javascript/proj.android/project.properties similarity index 100% rename from samples/TestJavascript/proj.android/project.properties rename to samples/test-javascript/proj.android/project.properties diff --git a/samples/TestJavascript/proj.android/res/values/strings.xml b/samples/test-javascript/proj.android/res/values/strings.xml similarity index 100% rename from samples/TestJavascript/proj.android/res/values/strings.xml rename to samples/test-javascript/proj.android/res/values/strings.xml diff --git a/samples/TestJavascript/proj.android/src/org/cocos2dx/testjavascript/Cocos2dxActivity.java b/samples/test-javascript/proj.android/src/org/cocos2dx/testjavascript/Cocos2dxActivity.java similarity index 100% rename from samples/TestJavascript/proj.android/src/org/cocos2dx/testjavascript/Cocos2dxActivity.java rename to samples/test-javascript/proj.android/src/org/cocos2dx/testjavascript/Cocos2dxActivity.java diff --git a/samples/TestJavascript/proj.ios/AppController.h b/samples/test-javascript/proj.ios/AppController.h similarity index 100% rename from samples/TestJavascript/proj.ios/AppController.h rename to samples/test-javascript/proj.ios/AppController.h diff --git a/samples/TestJavascript/proj.ios/AppController.mm b/samples/test-javascript/proj.ios/AppController.mm similarity index 100% rename from samples/TestJavascript/proj.ios/AppController.mm rename to samples/test-javascript/proj.ios/AppController.mm diff --git a/samples/TestJavascript/proj.ios/Default-568h@2x.png.REMOVED.git-id b/samples/test-javascript/proj.ios/Default-568h@2x.png.REMOVED.git-id similarity index 100% rename from samples/TestJavascript/proj.ios/Default-568h@2x.png.REMOVED.git-id rename to samples/test-javascript/proj.ios/Default-568h@2x.png.REMOVED.git-id diff --git a/samples/TestJavascript/proj.ios/Default@2x.png.REMOVED.git-id b/samples/test-javascript/proj.ios/Default@2x.png.REMOVED.git-id similarity index 100% rename from samples/TestJavascript/proj.ios/Default@2x.png.REMOVED.git-id rename to samples/test-javascript/proj.ios/Default@2x.png.REMOVED.git-id diff --git a/samples/TestJavascript/proj.ios/Prefix.pch b/samples/test-javascript/proj.ios/Prefix.pch similarity index 100% rename from samples/TestJavascript/proj.ios/Prefix.pch rename to samples/test-javascript/proj.ios/Prefix.pch diff --git a/samples/TestJavascript/proj.ios/RootViewController.h b/samples/test-javascript/proj.ios/RootViewController.h similarity index 100% rename from samples/TestJavascript/proj.ios/RootViewController.h rename to samples/test-javascript/proj.ios/RootViewController.h diff --git a/samples/TestJavascript/proj.ios/RootViewController.mm b/samples/test-javascript/proj.ios/RootViewController.mm similarity index 100% rename from samples/TestJavascript/proj.ios/RootViewController.mm rename to samples/test-javascript/proj.ios/RootViewController.mm diff --git a/samples/TestJavascript/proj.ios/main.m b/samples/test-javascript/proj.ios/main.m similarity index 100% rename from samples/TestJavascript/proj.ios/main.m rename to samples/test-javascript/proj.ios/main.m diff --git a/samples/TestJavascript/proj.mac/Icon.icns.REMOVED.git-id b/samples/test-javascript/proj.mac/Icon.icns.REMOVED.git-id similarity index 100% rename from samples/TestJavascript/proj.mac/Icon.icns.REMOVED.git-id rename to samples/test-javascript/proj.mac/Icon.icns.REMOVED.git-id diff --git a/samples/TestJavascript/proj.mac/Test_Prefix.pch b/samples/test-javascript/proj.mac/Test_Prefix.pch similarity index 100% rename from samples/TestJavascript/proj.mac/Test_Prefix.pch rename to samples/test-javascript/proj.mac/Test_Prefix.pch diff --git a/samples/TestJavascript/proj.mac/en.lproj/InfoPlist.strings b/samples/test-javascript/proj.mac/en.lproj/InfoPlist.strings similarity index 100% rename from samples/TestJavascript/proj.mac/en.lproj/InfoPlist.strings rename to samples/test-javascript/proj.mac/en.lproj/InfoPlist.strings diff --git a/samples/TestJavascript/proj.mac/en.lproj/MainMenu.xib b/samples/test-javascript/proj.mac/en.lproj/MainMenu.xib similarity index 100% rename from samples/TestJavascript/proj.mac/en.lproj/MainMenu.xib rename to samples/test-javascript/proj.mac/en.lproj/MainMenu.xib diff --git a/samples/TestJavascript/proj.mac/main.cpp b/samples/test-javascript/proj.mac/main.cpp similarity index 100% rename from samples/TestJavascript/proj.mac/main.cpp rename to samples/test-javascript/proj.mac/main.cpp diff --git a/samples/TestJavascript/proj.win32/TestJavascript.vcxproj b/samples/test-javascript/proj.win32/TestJavascript.vcxproj similarity index 100% rename from samples/TestJavascript/proj.win32/TestJavascript.vcxproj rename to samples/test-javascript/proj.win32/TestJavascript.vcxproj diff --git a/samples/TestJavascript/proj.win32/TestJavascript.vcxproj.filters b/samples/test-javascript/proj.win32/TestJavascript.vcxproj.filters similarity index 100% rename from samples/TestJavascript/proj.win32/TestJavascript.vcxproj.filters rename to samples/test-javascript/proj.win32/TestJavascript.vcxproj.filters diff --git a/samples/TestJavascript/proj.win32/TestJavascript.vcxproj.user b/samples/test-javascript/proj.win32/TestJavascript.vcxproj.user similarity index 100% rename from samples/TestJavascript/proj.win32/TestJavascript.vcxproj.user rename to samples/test-javascript/proj.win32/TestJavascript.vcxproj.user diff --git a/samples/TestJavascript/proj.win32/main.cpp b/samples/test-javascript/proj.win32/main.cpp similarity index 100% rename from samples/TestJavascript/proj.win32/main.cpp rename to samples/test-javascript/proj.win32/main.cpp diff --git a/samples/TestJavascript/proj.win32/main.h b/samples/test-javascript/proj.win32/main.h similarity index 100% rename from samples/TestJavascript/proj.win32/main.h rename to samples/test-javascript/proj.win32/main.h diff --git a/samples/TestJavascript/proj.win32/res/testjs.ico b/samples/test-javascript/proj.win32/res/testjs.ico similarity index 100% rename from samples/TestJavascript/proj.win32/res/testjs.ico rename to samples/test-javascript/proj.win32/res/testjs.ico diff --git a/samples/TestJavascript/proj.win32/resource.h b/samples/test-javascript/proj.win32/resource.h similarity index 100% rename from samples/TestJavascript/proj.win32/resource.h rename to samples/test-javascript/proj.win32/resource.h diff --git a/samples/TestJavascript/proj.win32/testjs.rc b/samples/test-javascript/proj.win32/testjs.rc similarity index 100% rename from samples/TestJavascript/proj.win32/testjs.rc rename to samples/test-javascript/proj.win32/testjs.rc diff --git a/samples/TestLua/.gitignore b/samples/test-lua/.gitignore similarity index 100% rename from samples/TestLua/.gitignore rename to samples/test-lua/.gitignore diff --git a/samples/TestLua/CMakeLists.txt b/samples/test-lua/CMakeLists.txt similarity index 100% rename from samples/TestLua/CMakeLists.txt rename to samples/test-lua/CMakeLists.txt diff --git a/samples/TestLua/Classes/AppDelegate.cpp b/samples/test-lua/Classes/AppDelegate.cpp similarity index 100% rename from samples/TestLua/Classes/AppDelegate.cpp rename to samples/test-lua/Classes/AppDelegate.cpp diff --git a/samples/TestLua/Classes/AppDelegate.h b/samples/test-lua/Classes/AppDelegate.h similarity index 100% rename from samples/TestLua/Classes/AppDelegate.h rename to samples/test-lua/Classes/AppDelegate.h diff --git a/samples/TestLua/Classes/lua_assetsmanager_test_sample.cpp b/samples/test-lua/Classes/lua_assetsmanager_test_sample.cpp similarity index 100% rename from samples/TestLua/Classes/lua_assetsmanager_test_sample.cpp rename to samples/test-lua/Classes/lua_assetsmanager_test_sample.cpp diff --git a/samples/TestLua/Classes/lua_assetsmanager_test_sample.h b/samples/test-lua/Classes/lua_assetsmanager_test_sample.h similarity index 100% rename from samples/TestLua/Classes/lua_assetsmanager_test_sample.h rename to samples/test-lua/Classes/lua_assetsmanager_test_sample.h diff --git a/samples/TestLua/Resources/cocosbuilderRes/ccb/flower.jpg.REMOVED.git-id b/samples/test-lua/Resources/cocosbuilderRes/ccb/flower.jpg.REMOVED.git-id similarity index 100% rename from samples/TestLua/Resources/cocosbuilderRes/ccb/flower.jpg.REMOVED.git-id rename to samples/test-lua/Resources/cocosbuilderRes/ccb/flower.jpg.REMOVED.git-id diff --git a/samples/TestLua/Resources/cocosbuilderRes/ccb/gem-0.wav.REMOVED.git-id b/samples/test-lua/Resources/cocosbuilderRes/ccb/gem-0.wav.REMOVED.git-id similarity index 100% rename from samples/TestLua/Resources/cocosbuilderRes/ccb/gem-0.wav.REMOVED.git-id rename to samples/test-lua/Resources/cocosbuilderRes/ccb/gem-0.wav.REMOVED.git-id diff --git a/samples/TestLua/Resources/cocosbuilderRes/ccb/gem-1.wav.REMOVED.git-id b/samples/test-lua/Resources/cocosbuilderRes/ccb/gem-1.wav.REMOVED.git-id similarity index 100% rename from samples/TestLua/Resources/cocosbuilderRes/ccb/gem-1.wav.REMOVED.git-id rename to samples/test-lua/Resources/cocosbuilderRes/ccb/gem-1.wav.REMOVED.git-id diff --git a/samples/TestLua/Resources/cocosbuilderRes/ccb/markerfelt24shadow.fnt.REMOVED.git-id b/samples/test-lua/Resources/cocosbuilderRes/ccb/markerfelt24shadow.fnt.REMOVED.git-id similarity index 100% rename from samples/TestLua/Resources/cocosbuilderRes/ccb/markerfelt24shadow.fnt.REMOVED.git-id rename to samples/test-lua/Resources/cocosbuilderRes/ccb/markerfelt24shadow.fnt.REMOVED.git-id diff --git a/samples/TestLua/Resources/luaScript/AccelerometerTest/AccelerometerTest.lua b/samples/test-lua/Resources/luaScript/AccelerometerTest/AccelerometerTest.lua similarity index 100% rename from samples/TestLua/Resources/luaScript/AccelerometerTest/AccelerometerTest.lua rename to samples/test-lua/Resources/luaScript/AccelerometerTest/AccelerometerTest.lua diff --git a/samples/TestLua/Resources/luaScript/ActionManagerTest/ActionManagerTest.lua b/samples/test-lua/Resources/luaScript/ActionManagerTest/ActionManagerTest.lua similarity index 100% rename from samples/TestLua/Resources/luaScript/ActionManagerTest/ActionManagerTest.lua rename to samples/test-lua/Resources/luaScript/ActionManagerTest/ActionManagerTest.lua diff --git a/samples/TestLua/Resources/luaScript/ActionsEaseTest/ActionsEaseTest.lua b/samples/test-lua/Resources/luaScript/ActionsEaseTest/ActionsEaseTest.lua similarity index 100% rename from samples/TestLua/Resources/luaScript/ActionsEaseTest/ActionsEaseTest.lua rename to samples/test-lua/Resources/luaScript/ActionsEaseTest/ActionsEaseTest.lua diff --git a/samples/TestLua/Resources/luaScript/ActionsProgressTest/ActionsProgressTest.lua b/samples/test-lua/Resources/luaScript/ActionsProgressTest/ActionsProgressTest.lua similarity index 100% rename from samples/TestLua/Resources/luaScript/ActionsProgressTest/ActionsProgressTest.lua rename to samples/test-lua/Resources/luaScript/ActionsProgressTest/ActionsProgressTest.lua diff --git a/samples/TestLua/Resources/luaScript/ActionsTest/ActionsTest.lua b/samples/test-lua/Resources/luaScript/ActionsTest/ActionsTest.lua similarity index 100% rename from samples/TestLua/Resources/luaScript/ActionsTest/ActionsTest.lua rename to samples/test-lua/Resources/luaScript/ActionsTest/ActionsTest.lua diff --git a/samples/TestLua/Resources/luaScript/AssetsManagerTest/AssetsManagerModule.lua b/samples/test-lua/Resources/luaScript/AssetsManagerTest/AssetsManagerModule.lua similarity index 100% rename from samples/TestLua/Resources/luaScript/AssetsManagerTest/AssetsManagerModule.lua rename to samples/test-lua/Resources/luaScript/AssetsManagerTest/AssetsManagerModule.lua diff --git a/samples/TestLua/Resources/luaScript/AssetsManagerTest/AssetsManagerTest.lua b/samples/test-lua/Resources/luaScript/AssetsManagerTest/AssetsManagerTest.lua similarity index 100% rename from samples/TestLua/Resources/luaScript/AssetsManagerTest/AssetsManagerTest.lua rename to samples/test-lua/Resources/luaScript/AssetsManagerTest/AssetsManagerTest.lua diff --git a/samples/TestLua/Resources/luaScript/BugsTest/BugsTest.lua b/samples/test-lua/Resources/luaScript/BugsTest/BugsTest.lua similarity index 100% rename from samples/TestLua/Resources/luaScript/BugsTest/BugsTest.lua rename to samples/test-lua/Resources/luaScript/BugsTest/BugsTest.lua diff --git a/samples/TestLua/Resources/luaScript/ClickAndMoveTest/ClickAndMoveTest.lua b/samples/test-lua/Resources/luaScript/ClickAndMoveTest/ClickAndMoveTest.lua similarity index 100% rename from samples/TestLua/Resources/luaScript/ClickAndMoveTest/ClickAndMoveTest.lua rename to samples/test-lua/Resources/luaScript/ClickAndMoveTest/ClickAndMoveTest.lua diff --git a/samples/TestLua/Resources/luaScript/CocoStudioTest/CocoStudioArmatureTest/CocoStudioArmatureTest.lua b/samples/test-lua/Resources/luaScript/CocoStudioTest/CocoStudioArmatureTest/CocoStudioArmatureTest.lua similarity index 100% rename from samples/TestLua/Resources/luaScript/CocoStudioTest/CocoStudioArmatureTest/CocoStudioArmatureTest.lua rename to samples/test-lua/Resources/luaScript/CocoStudioTest/CocoStudioArmatureTest/CocoStudioArmatureTest.lua diff --git a/samples/TestLua/Resources/luaScript/CocoStudioTest/CocoStudioGUITest/CocoStudioGUITest.lua.REMOVED.git-id b/samples/test-lua/Resources/luaScript/CocoStudioTest/CocoStudioGUITest/CocoStudioGUITest.lua.REMOVED.git-id similarity index 100% rename from samples/TestLua/Resources/luaScript/CocoStudioTest/CocoStudioGUITest/CocoStudioGUITest.lua.REMOVED.git-id rename to samples/test-lua/Resources/luaScript/CocoStudioTest/CocoStudioGUITest/CocoStudioGUITest.lua.REMOVED.git-id diff --git a/samples/TestLua/Resources/luaScript/CocoStudioTest/CocoStudioSceneTest/CocoStudioSceneTest.lua b/samples/test-lua/Resources/luaScript/CocoStudioTest/CocoStudioSceneTest/CocoStudioSceneTest.lua similarity index 100% rename from samples/TestLua/Resources/luaScript/CocoStudioTest/CocoStudioSceneTest/CocoStudioSceneTest.lua rename to samples/test-lua/Resources/luaScript/CocoStudioTest/CocoStudioSceneTest/CocoStudioSceneTest.lua diff --git a/samples/TestLua/Resources/luaScript/CocoStudioTest/CocoStudioSceneTest/TriggerCode/acts.lua b/samples/test-lua/Resources/luaScript/CocoStudioTest/CocoStudioSceneTest/TriggerCode/acts.lua similarity index 100% rename from samples/TestLua/Resources/luaScript/CocoStudioTest/CocoStudioSceneTest/TriggerCode/acts.lua rename to samples/test-lua/Resources/luaScript/CocoStudioTest/CocoStudioSceneTest/TriggerCode/acts.lua diff --git a/samples/TestLua/Resources/luaScript/CocoStudioTest/CocoStudioSceneTest/TriggerCode/cons.lua b/samples/test-lua/Resources/luaScript/CocoStudioTest/CocoStudioSceneTest/TriggerCode/cons.lua similarity index 100% rename from samples/TestLua/Resources/luaScript/CocoStudioTest/CocoStudioSceneTest/TriggerCode/cons.lua rename to samples/test-lua/Resources/luaScript/CocoStudioTest/CocoStudioSceneTest/TriggerCode/cons.lua diff --git a/samples/TestLua/Resources/luaScript/CocoStudioTest/CocoStudioSceneTest/TriggerCode/eventDef.lua b/samples/test-lua/Resources/luaScript/CocoStudioTest/CocoStudioSceneTest/TriggerCode/eventDef.lua similarity index 100% rename from samples/TestLua/Resources/luaScript/CocoStudioTest/CocoStudioSceneTest/TriggerCode/eventDef.lua rename to samples/test-lua/Resources/luaScript/CocoStudioTest/CocoStudioSceneTest/TriggerCode/eventDef.lua diff --git a/samples/TestLua/Resources/luaScript/CocoStudioTest/CocoStudioTest.lua b/samples/test-lua/Resources/luaScript/CocoStudioTest/CocoStudioTest.lua similarity index 100% rename from samples/TestLua/Resources/luaScript/CocoStudioTest/CocoStudioTest.lua rename to samples/test-lua/Resources/luaScript/CocoStudioTest/CocoStudioTest.lua diff --git a/samples/TestLua/Resources/luaScript/CocosDenshionTest/CocosDenshionTest.lua b/samples/test-lua/Resources/luaScript/CocosDenshionTest/CocosDenshionTest.lua similarity index 100% rename from samples/TestLua/Resources/luaScript/CocosDenshionTest/CocosDenshionTest.lua rename to samples/test-lua/Resources/luaScript/CocosDenshionTest/CocosDenshionTest.lua diff --git a/samples/TestLua/Resources/luaScript/CurrentLanguageTest/CurrentLanguageTest.lua b/samples/test-lua/Resources/luaScript/CurrentLanguageTest/CurrentLanguageTest.lua similarity index 100% rename from samples/TestLua/Resources/luaScript/CurrentLanguageTest/CurrentLanguageTest.lua rename to samples/test-lua/Resources/luaScript/CurrentLanguageTest/CurrentLanguageTest.lua diff --git a/samples/TestLua/Resources/luaScript/DrawPrimitivesTest/DrawPrimitivesTest.lua b/samples/test-lua/Resources/luaScript/DrawPrimitivesTest/DrawPrimitivesTest.lua similarity index 100% rename from samples/TestLua/Resources/luaScript/DrawPrimitivesTest/DrawPrimitivesTest.lua rename to samples/test-lua/Resources/luaScript/DrawPrimitivesTest/DrawPrimitivesTest.lua diff --git a/samples/TestLua/Resources/luaScript/EffectsAdvancedTest/EffectsAdvancedTest.lua b/samples/test-lua/Resources/luaScript/EffectsAdvancedTest/EffectsAdvancedTest.lua similarity index 100% rename from samples/TestLua/Resources/luaScript/EffectsAdvancedTest/EffectsAdvancedTest.lua rename to samples/test-lua/Resources/luaScript/EffectsAdvancedTest/EffectsAdvancedTest.lua diff --git a/samples/TestLua/Resources/luaScript/EffectsTest/EffectsName.lua b/samples/test-lua/Resources/luaScript/EffectsTest/EffectsName.lua similarity index 100% rename from samples/TestLua/Resources/luaScript/EffectsTest/EffectsName.lua rename to samples/test-lua/Resources/luaScript/EffectsTest/EffectsName.lua diff --git a/samples/TestLua/Resources/luaScript/EffectsTest/EffectsTest.lua b/samples/test-lua/Resources/luaScript/EffectsTest/EffectsTest.lua similarity index 100% rename from samples/TestLua/Resources/luaScript/EffectsTest/EffectsTest.lua rename to samples/test-lua/Resources/luaScript/EffectsTest/EffectsTest.lua diff --git a/samples/TestLua/Resources/luaScript/ExtensionTest/CocosBuilderTest.lua b/samples/test-lua/Resources/luaScript/ExtensionTest/CocosBuilderTest.lua similarity index 100% rename from samples/TestLua/Resources/luaScript/ExtensionTest/CocosBuilderTest.lua rename to samples/test-lua/Resources/luaScript/ExtensionTest/CocosBuilderTest.lua diff --git a/samples/TestLua/Resources/luaScript/ExtensionTest/ExtensionTest.lua b/samples/test-lua/Resources/luaScript/ExtensionTest/ExtensionTest.lua similarity index 100% rename from samples/TestLua/Resources/luaScript/ExtensionTest/ExtensionTest.lua rename to samples/test-lua/Resources/luaScript/ExtensionTest/ExtensionTest.lua diff --git a/samples/TestLua/Resources/luaScript/ExtensionTest/WebProxyTest.lua b/samples/test-lua/Resources/luaScript/ExtensionTest/WebProxyTest.lua similarity index 100% rename from samples/TestLua/Resources/luaScript/ExtensionTest/WebProxyTest.lua rename to samples/test-lua/Resources/luaScript/ExtensionTest/WebProxyTest.lua diff --git a/samples/TestLua/Resources/luaScript/FontTest/FontTest.lua b/samples/test-lua/Resources/luaScript/FontTest/FontTest.lua similarity index 100% rename from samples/TestLua/Resources/luaScript/FontTest/FontTest.lua rename to samples/test-lua/Resources/luaScript/FontTest/FontTest.lua diff --git a/samples/TestLua/Resources/luaScript/IntervalTest/IntervalTest.lua b/samples/test-lua/Resources/luaScript/IntervalTest/IntervalTest.lua similarity index 100% rename from samples/TestLua/Resources/luaScript/IntervalTest/IntervalTest.lua rename to samples/test-lua/Resources/luaScript/IntervalTest/IntervalTest.lua diff --git a/samples/TestLua/Resources/luaScript/KeypadTest/KeypadTest.lua b/samples/test-lua/Resources/luaScript/KeypadTest/KeypadTest.lua similarity index 100% rename from samples/TestLua/Resources/luaScript/KeypadTest/KeypadTest.lua rename to samples/test-lua/Resources/luaScript/KeypadTest/KeypadTest.lua diff --git a/samples/TestLua/Resources/luaScript/LabelTest/LabelTest.lua b/samples/test-lua/Resources/luaScript/LabelTest/LabelTest.lua similarity index 100% rename from samples/TestLua/Resources/luaScript/LabelTest/LabelTest.lua rename to samples/test-lua/Resources/luaScript/LabelTest/LabelTest.lua diff --git a/samples/TestLua/Resources/luaScript/LabelTestNew/LabelTestNew.lua b/samples/test-lua/Resources/luaScript/LabelTestNew/LabelTestNew.lua similarity index 100% rename from samples/TestLua/Resources/luaScript/LabelTestNew/LabelTestNew.lua rename to samples/test-lua/Resources/luaScript/LabelTestNew/LabelTestNew.lua diff --git a/samples/TestLua/Resources/luaScript/LayerTest/LayerTest.lua b/samples/test-lua/Resources/luaScript/LayerTest/LayerTest.lua similarity index 100% rename from samples/TestLua/Resources/luaScript/LayerTest/LayerTest.lua rename to samples/test-lua/Resources/luaScript/LayerTest/LayerTest.lua diff --git a/samples/TestLua/Resources/luaScript/LuaBridgeTest/LuaBridgeTest.lua b/samples/test-lua/Resources/luaScript/LuaBridgeTest/LuaBridgeTest.lua similarity index 100% rename from samples/TestLua/Resources/luaScript/LuaBridgeTest/LuaBridgeTest.lua rename to samples/test-lua/Resources/luaScript/LuaBridgeTest/LuaBridgeTest.lua diff --git a/samples/TestLua/Resources/luaScript/MenuTest/MenuTest.lua b/samples/test-lua/Resources/luaScript/MenuTest/MenuTest.lua similarity index 100% rename from samples/TestLua/Resources/luaScript/MenuTest/MenuTest.lua rename to samples/test-lua/Resources/luaScript/MenuTest/MenuTest.lua diff --git a/samples/TestLua/Resources/luaScript/MotionStreakTest/MotionStreakTest.lua b/samples/test-lua/Resources/luaScript/MotionStreakTest/MotionStreakTest.lua similarity index 100% rename from samples/TestLua/Resources/luaScript/MotionStreakTest/MotionStreakTest.lua rename to samples/test-lua/Resources/luaScript/MotionStreakTest/MotionStreakTest.lua diff --git a/samples/TestLua/Resources/luaScript/NewEventDispatcherTest/NewEventDispatcherTest.lua b/samples/test-lua/Resources/luaScript/NewEventDispatcherTest/NewEventDispatcherTest.lua similarity index 100% rename from samples/TestLua/Resources/luaScript/NewEventDispatcherTest/NewEventDispatcherTest.lua rename to samples/test-lua/Resources/luaScript/NewEventDispatcherTest/NewEventDispatcherTest.lua diff --git a/samples/TestLua/Resources/luaScript/NodeTest/NodeTest.lua b/samples/test-lua/Resources/luaScript/NodeTest/NodeTest.lua similarity index 100% rename from samples/TestLua/Resources/luaScript/NodeTest/NodeTest.lua rename to samples/test-lua/Resources/luaScript/NodeTest/NodeTest.lua diff --git a/samples/TestLua/Resources/luaScript/OpenGLTest/OpenGLTest.lua b/samples/test-lua/Resources/luaScript/OpenGLTest/OpenGLTest.lua similarity index 100% rename from samples/TestLua/Resources/luaScript/OpenGLTest/OpenGLTest.lua rename to samples/test-lua/Resources/luaScript/OpenGLTest/OpenGLTest.lua diff --git a/samples/TestLua/Resources/luaScript/ParallaxTest/ParallaxTest.lua b/samples/test-lua/Resources/luaScript/ParallaxTest/ParallaxTest.lua similarity index 100% rename from samples/TestLua/Resources/luaScript/ParallaxTest/ParallaxTest.lua rename to samples/test-lua/Resources/luaScript/ParallaxTest/ParallaxTest.lua diff --git a/samples/TestLua/Resources/luaScript/ParticleTest/ParticleTest.lua b/samples/test-lua/Resources/luaScript/ParticleTest/ParticleTest.lua similarity index 100% rename from samples/TestLua/Resources/luaScript/ParticleTest/ParticleTest.lua rename to samples/test-lua/Resources/luaScript/ParticleTest/ParticleTest.lua diff --git a/samples/TestLua/Resources/luaScript/PerformanceTest/PerformanceSpriteTest.lua b/samples/test-lua/Resources/luaScript/PerformanceTest/PerformanceSpriteTest.lua similarity index 100% rename from samples/TestLua/Resources/luaScript/PerformanceTest/PerformanceSpriteTest.lua rename to samples/test-lua/Resources/luaScript/PerformanceTest/PerformanceSpriteTest.lua diff --git a/samples/TestLua/Resources/luaScript/PerformanceTest/PerformanceTest.lua b/samples/test-lua/Resources/luaScript/PerformanceTest/PerformanceTest.lua similarity index 100% rename from samples/TestLua/Resources/luaScript/PerformanceTest/PerformanceTest.lua rename to samples/test-lua/Resources/luaScript/PerformanceTest/PerformanceTest.lua diff --git a/samples/TestLua/Resources/luaScript/PhysicsTest/PhysicsTest.lua b/samples/test-lua/Resources/luaScript/PhysicsTest/PhysicsTest.lua similarity index 100% rename from samples/TestLua/Resources/luaScript/PhysicsTest/PhysicsTest.lua rename to samples/test-lua/Resources/luaScript/PhysicsTest/PhysicsTest.lua diff --git a/samples/TestLua/Resources/luaScript/RenderTextureTest/RenderTextureTest.lua b/samples/test-lua/Resources/luaScript/RenderTextureTest/RenderTextureTest.lua similarity index 100% rename from samples/TestLua/Resources/luaScript/RenderTextureTest/RenderTextureTest.lua rename to samples/test-lua/Resources/luaScript/RenderTextureTest/RenderTextureTest.lua diff --git a/samples/TestLua/Resources/luaScript/RotateWorldTest/RotateWorldTest.lua b/samples/test-lua/Resources/luaScript/RotateWorldTest/RotateWorldTest.lua similarity index 100% rename from samples/TestLua/Resources/luaScript/RotateWorldTest/RotateWorldTest.lua rename to samples/test-lua/Resources/luaScript/RotateWorldTest/RotateWorldTest.lua diff --git a/samples/TestLua/Resources/luaScript/SceneTest/SceneTest.lua b/samples/test-lua/Resources/luaScript/SceneTest/SceneTest.lua similarity index 100% rename from samples/TestLua/Resources/luaScript/SceneTest/SceneTest.lua rename to samples/test-lua/Resources/luaScript/SceneTest/SceneTest.lua diff --git a/samples/TestLua/Resources/luaScript/SpineTest/SpineTest.lua b/samples/test-lua/Resources/luaScript/SpineTest/SpineTest.lua similarity index 100% rename from samples/TestLua/Resources/luaScript/SpineTest/SpineTest.lua rename to samples/test-lua/Resources/luaScript/SpineTest/SpineTest.lua diff --git a/samples/TestLua/Resources/luaScript/SpriteTest/SpriteTest.lua b/samples/test-lua/Resources/luaScript/SpriteTest/SpriteTest.lua similarity index 100% rename from samples/TestLua/Resources/luaScript/SpriteTest/SpriteTest.lua rename to samples/test-lua/Resources/luaScript/SpriteTest/SpriteTest.lua diff --git a/samples/TestLua/Resources/luaScript/Texture2dTest/Texture2dTest.lua b/samples/test-lua/Resources/luaScript/Texture2dTest/Texture2dTest.lua similarity index 100% rename from samples/TestLua/Resources/luaScript/Texture2dTest/Texture2dTest.lua rename to samples/test-lua/Resources/luaScript/Texture2dTest/Texture2dTest.lua diff --git a/samples/TestLua/Resources/luaScript/TileMapTest/TileMapTest.lua b/samples/test-lua/Resources/luaScript/TileMapTest/TileMapTest.lua similarity index 100% rename from samples/TestLua/Resources/luaScript/TileMapTest/TileMapTest.lua rename to samples/test-lua/Resources/luaScript/TileMapTest/TileMapTest.lua diff --git a/samples/TestLua/Resources/luaScript/TouchesTest/Ball.lua b/samples/test-lua/Resources/luaScript/TouchesTest/Ball.lua similarity index 100% rename from samples/TestLua/Resources/luaScript/TouchesTest/Ball.lua rename to samples/test-lua/Resources/luaScript/TouchesTest/Ball.lua diff --git a/samples/TestLua/Resources/luaScript/TouchesTest/Paddle.lua b/samples/test-lua/Resources/luaScript/TouchesTest/Paddle.lua similarity index 100% rename from samples/TestLua/Resources/luaScript/TouchesTest/Paddle.lua rename to samples/test-lua/Resources/luaScript/TouchesTest/Paddle.lua diff --git a/samples/TestLua/Resources/luaScript/TouchesTest/TouchesTest.lua b/samples/test-lua/Resources/luaScript/TouchesTest/TouchesTest.lua similarity index 100% rename from samples/TestLua/Resources/luaScript/TouchesTest/TouchesTest.lua rename to samples/test-lua/Resources/luaScript/TouchesTest/TouchesTest.lua diff --git a/samples/TestLua/Resources/luaScript/TransitionsTest/TransitionsName.lua b/samples/test-lua/Resources/luaScript/TransitionsTest/TransitionsName.lua similarity index 100% rename from samples/TestLua/Resources/luaScript/TransitionsTest/TransitionsName.lua rename to samples/test-lua/Resources/luaScript/TransitionsTest/TransitionsName.lua diff --git a/samples/TestLua/Resources/luaScript/TransitionsTest/TransitionsTest.lua b/samples/test-lua/Resources/luaScript/TransitionsTest/TransitionsTest.lua similarity index 100% rename from samples/TestLua/Resources/luaScript/TransitionsTest/TransitionsTest.lua rename to samples/test-lua/Resources/luaScript/TransitionsTest/TransitionsTest.lua diff --git a/samples/TestLua/Resources/luaScript/UserDefaultTest/UserDefaultTest.lua b/samples/test-lua/Resources/luaScript/UserDefaultTest/UserDefaultTest.lua similarity index 100% rename from samples/TestLua/Resources/luaScript/UserDefaultTest/UserDefaultTest.lua rename to samples/test-lua/Resources/luaScript/UserDefaultTest/UserDefaultTest.lua diff --git a/samples/TestLua/Resources/luaScript/VisibleRect.lua b/samples/test-lua/Resources/luaScript/VisibleRect.lua similarity index 100% rename from samples/TestLua/Resources/luaScript/VisibleRect.lua rename to samples/test-lua/Resources/luaScript/VisibleRect.lua diff --git a/samples/TestLua/Resources/luaScript/XMLHttpRequestTest/XMLHttpRequestTest.lua b/samples/test-lua/Resources/luaScript/XMLHttpRequestTest/XMLHttpRequestTest.lua similarity index 100% rename from samples/TestLua/Resources/luaScript/XMLHttpRequestTest/XMLHttpRequestTest.lua rename to samples/test-lua/Resources/luaScript/XMLHttpRequestTest/XMLHttpRequestTest.lua diff --git a/samples/TestLua/Resources/luaScript/ZwoptexTest/ZwoptexTest.lua b/samples/test-lua/Resources/luaScript/ZwoptexTest/ZwoptexTest.lua similarity index 100% rename from samples/TestLua/Resources/luaScript/ZwoptexTest/ZwoptexTest.lua rename to samples/test-lua/Resources/luaScript/ZwoptexTest/ZwoptexTest.lua diff --git a/samples/TestLua/Resources/luaScript/controller.lua b/samples/test-lua/Resources/luaScript/controller.lua similarity index 100% rename from samples/TestLua/Resources/luaScript/controller.lua rename to samples/test-lua/Resources/luaScript/controller.lua diff --git a/samples/TestLua/Resources/luaScript/helper.lua b/samples/test-lua/Resources/luaScript/helper.lua similarity index 100% rename from samples/TestLua/Resources/luaScript/helper.lua rename to samples/test-lua/Resources/luaScript/helper.lua diff --git a/samples/TestLua/Resources/luaScript/mainMenu.lua b/samples/test-lua/Resources/luaScript/mainMenu.lua similarity index 100% rename from samples/TestLua/Resources/luaScript/mainMenu.lua rename to samples/test-lua/Resources/luaScript/mainMenu.lua diff --git a/samples/TestLua/Resources/luaScript/testResource.lua b/samples/test-lua/Resources/luaScript/testResource.lua similarity index 100% rename from samples/TestLua/Resources/luaScript/testResource.lua rename to samples/test-lua/Resources/luaScript/testResource.lua diff --git a/samples/TestLua/proj.android/.classpath b/samples/test-lua/proj.android/.classpath similarity index 100% rename from samples/TestLua/proj.android/.classpath rename to samples/test-lua/proj.android/.classpath diff --git a/samples/TestLua/proj.android/.project b/samples/test-lua/proj.android/.project similarity index 100% rename from samples/TestLua/proj.android/.project rename to samples/test-lua/proj.android/.project diff --git a/samples/TestLua/proj.android/AndroidManifest.xml b/samples/test-lua/proj.android/AndroidManifest.xml similarity index 100% rename from samples/TestLua/proj.android/AndroidManifest.xml rename to samples/test-lua/proj.android/AndroidManifest.xml diff --git a/samples/TestLua/proj.android/ant.properties b/samples/test-lua/proj.android/ant.properties similarity index 100% rename from samples/TestLua/proj.android/ant.properties rename to samples/test-lua/proj.android/ant.properties diff --git a/samples/TestLua/proj.android/build.xml b/samples/test-lua/proj.android/build.xml similarity index 100% rename from samples/TestLua/proj.android/build.xml rename to samples/test-lua/proj.android/build.xml diff --git a/samples/TestLua/proj.android/jni/Android.mk b/samples/test-lua/proj.android/jni/Android.mk similarity index 100% rename from samples/TestLua/proj.android/jni/Android.mk rename to samples/test-lua/proj.android/jni/Android.mk diff --git a/samples/TestLua/proj.android/jni/Application.mk b/samples/test-lua/proj.android/jni/Application.mk similarity index 100% rename from samples/TestLua/proj.android/jni/Application.mk rename to samples/test-lua/proj.android/jni/Application.mk diff --git a/samples/TestLua/proj.android/jni/testlua/main.cpp b/samples/test-lua/proj.android/jni/testlua/main.cpp similarity index 100% rename from samples/TestLua/proj.android/jni/testlua/main.cpp rename to samples/test-lua/proj.android/jni/testlua/main.cpp diff --git a/samples/TestLua/proj.android/proguard-project.txt b/samples/test-lua/proj.android/proguard-project.txt similarity index 100% rename from samples/TestLua/proj.android/proguard-project.txt rename to samples/test-lua/proj.android/proguard-project.txt diff --git a/samples/TestLua/proj.android/project.properties b/samples/test-lua/proj.android/project.properties similarity index 100% rename from samples/TestLua/proj.android/project.properties rename to samples/test-lua/proj.android/project.properties diff --git a/samples/TestLua/proj.android/res/values/strings.xml b/samples/test-lua/proj.android/res/values/strings.xml similarity index 100% rename from samples/TestLua/proj.android/res/values/strings.xml rename to samples/test-lua/proj.android/res/values/strings.xml diff --git a/samples/TestLua/proj.android/src/com/cocos2dx/sample/LuaJavaBridgeTest/LuaJavaBridgeTest.java b/samples/test-lua/proj.android/src/com/cocos2dx/sample/LuaJavaBridgeTest/LuaJavaBridgeTest.java similarity index 100% rename from samples/TestLua/proj.android/src/com/cocos2dx/sample/LuaJavaBridgeTest/LuaJavaBridgeTest.java rename to samples/test-lua/proj.android/src/com/cocos2dx/sample/LuaJavaBridgeTest/LuaJavaBridgeTest.java diff --git a/samples/TestLua/proj.android/src/org/cocos2dx/testlua/Cocos2dxActivity.java b/samples/test-lua/proj.android/src/org/cocos2dx/testlua/Cocos2dxActivity.java similarity index 100% rename from samples/TestLua/proj.android/src/org/cocos2dx/testlua/Cocos2dxActivity.java rename to samples/test-lua/proj.android/src/org/cocos2dx/testlua/Cocos2dxActivity.java diff --git a/samples/TestLua/proj.ios/AppController.h b/samples/test-lua/proj.ios/AppController.h similarity index 100% rename from samples/TestLua/proj.ios/AppController.h rename to samples/test-lua/proj.ios/AppController.h diff --git a/samples/TestLua/proj.ios/AppController.mm b/samples/test-lua/proj.ios/AppController.mm similarity index 100% rename from samples/TestLua/proj.ios/AppController.mm rename to samples/test-lua/proj.ios/AppController.mm diff --git a/samples/TestLua/proj.ios/Default-568h@2x.png.REMOVED.git-id b/samples/test-lua/proj.ios/Default-568h@2x.png.REMOVED.git-id similarity index 100% rename from samples/TestLua/proj.ios/Default-568h@2x.png.REMOVED.git-id rename to samples/test-lua/proj.ios/Default-568h@2x.png.REMOVED.git-id diff --git a/samples/TestLua/proj.ios/Default@2x.png.REMOVED.git-id b/samples/test-lua/proj.ios/Default@2x.png.REMOVED.git-id similarity index 100% rename from samples/TestLua/proj.ios/Default@2x.png.REMOVED.git-id rename to samples/test-lua/proj.ios/Default@2x.png.REMOVED.git-id diff --git a/samples/TestLua/proj.ios/LuaObjectCBridgeTest.h b/samples/test-lua/proj.ios/LuaObjectCBridgeTest.h similarity index 100% rename from samples/TestLua/proj.ios/LuaObjectCBridgeTest.h rename to samples/test-lua/proj.ios/LuaObjectCBridgeTest.h diff --git a/samples/TestLua/proj.ios/LuaObjectCBridgeTest.mm b/samples/test-lua/proj.ios/LuaObjectCBridgeTest.mm similarity index 100% rename from samples/TestLua/proj.ios/LuaObjectCBridgeTest.mm rename to samples/test-lua/proj.ios/LuaObjectCBridgeTest.mm diff --git a/samples/TestLua/proj.ios/RootViewController.h b/samples/test-lua/proj.ios/RootViewController.h similarity index 100% rename from samples/TestLua/proj.ios/RootViewController.h rename to samples/test-lua/proj.ios/RootViewController.h diff --git a/samples/TestLua/proj.ios/RootViewController.mm b/samples/test-lua/proj.ios/RootViewController.mm similarity index 100% rename from samples/TestLua/proj.ios/RootViewController.mm rename to samples/test-lua/proj.ios/RootViewController.mm diff --git a/samples/TestLua/proj.ios/TestLua_Prefix.pch b/samples/test-lua/proj.ios/TestLua_Prefix.pch similarity index 100% rename from samples/TestLua/proj.ios/TestLua_Prefix.pch rename to samples/test-lua/proj.ios/TestLua_Prefix.pch diff --git a/samples/TestLua/proj.ios/main.m b/samples/test-lua/proj.ios/main.m similarity index 100% rename from samples/TestLua/proj.ios/main.m rename to samples/test-lua/proj.ios/main.m diff --git a/samples/TestLua/proj.linux/main.cpp b/samples/test-lua/proj.linux/main.cpp similarity index 100% rename from samples/TestLua/proj.linux/main.cpp rename to samples/test-lua/proj.linux/main.cpp diff --git a/samples/TestLua/proj.mac/Icon.icns.REMOVED.git-id b/samples/test-lua/proj.mac/Icon.icns.REMOVED.git-id similarity index 100% rename from samples/TestLua/proj.mac/Icon.icns.REMOVED.git-id rename to samples/test-lua/proj.mac/Icon.icns.REMOVED.git-id diff --git a/samples/TestLua/proj.mac/LuaObjectCBridgeTest.h b/samples/test-lua/proj.mac/LuaObjectCBridgeTest.h similarity index 100% rename from samples/TestLua/proj.mac/LuaObjectCBridgeTest.h rename to samples/test-lua/proj.mac/LuaObjectCBridgeTest.h diff --git a/samples/TestLua/proj.mac/LuaObjectCBridgeTest.mm b/samples/test-lua/proj.mac/LuaObjectCBridgeTest.mm similarity index 100% rename from samples/TestLua/proj.mac/LuaObjectCBridgeTest.mm rename to samples/test-lua/proj.mac/LuaObjectCBridgeTest.mm diff --git a/samples/TestLua/proj.mac/TestLua_Prefix.pch b/samples/test-lua/proj.mac/TestLua_Prefix.pch similarity index 100% rename from samples/TestLua/proj.mac/TestLua_Prefix.pch rename to samples/test-lua/proj.mac/TestLua_Prefix.pch diff --git a/samples/TestLua/proj.mac/en.lproj/InfoPlist.strings b/samples/test-lua/proj.mac/en.lproj/InfoPlist.strings similarity index 100% rename from samples/TestLua/proj.mac/en.lproj/InfoPlist.strings rename to samples/test-lua/proj.mac/en.lproj/InfoPlist.strings diff --git a/samples/TestLua/proj.mac/en.lproj/MainMenu.xib b/samples/test-lua/proj.mac/en.lproj/MainMenu.xib similarity index 100% rename from samples/TestLua/proj.mac/en.lproj/MainMenu.xib rename to samples/test-lua/proj.mac/en.lproj/MainMenu.xib diff --git a/samples/TestLua/proj.mac/main.cpp b/samples/test-lua/proj.mac/main.cpp similarity index 100% rename from samples/TestLua/proj.mac/main.cpp rename to samples/test-lua/proj.mac/main.cpp diff --git a/samples/TestLua/proj.win32/TestLua.rc b/samples/test-lua/proj.win32/TestLua.rc similarity index 100% rename from samples/TestLua/proj.win32/TestLua.rc rename to samples/test-lua/proj.win32/TestLua.rc diff --git a/samples/TestLua/proj.win32/TestLua.win32.vcxproj b/samples/test-lua/proj.win32/TestLua.win32.vcxproj similarity index 100% rename from samples/TestLua/proj.win32/TestLua.win32.vcxproj rename to samples/test-lua/proj.win32/TestLua.win32.vcxproj diff --git a/samples/TestLua/proj.win32/TestLua.win32.vcxproj.filters b/samples/test-lua/proj.win32/TestLua.win32.vcxproj.filters similarity index 100% rename from samples/TestLua/proj.win32/TestLua.win32.vcxproj.filters rename to samples/test-lua/proj.win32/TestLua.win32.vcxproj.filters diff --git a/samples/TestLua/proj.win32/TestLua.win32.vcxproj.user b/samples/test-lua/proj.win32/TestLua.win32.vcxproj.user similarity index 100% rename from samples/TestLua/proj.win32/TestLua.win32.vcxproj.user rename to samples/test-lua/proj.win32/TestLua.win32.vcxproj.user diff --git a/samples/TestLua/proj.win32/main.cpp b/samples/test-lua/proj.win32/main.cpp similarity index 100% rename from samples/TestLua/proj.win32/main.cpp rename to samples/test-lua/proj.win32/main.cpp diff --git a/samples/TestLua/proj.win32/main.h b/samples/test-lua/proj.win32/main.h similarity index 100% rename from samples/TestLua/proj.win32/main.h rename to samples/test-lua/proj.win32/main.h diff --git a/samples/TestLua/proj.win32/res/TestLua.ico b/samples/test-lua/proj.win32/res/TestLua.ico similarity index 100% rename from samples/TestLua/proj.win32/res/TestLua.ico rename to samples/test-lua/proj.win32/res/TestLua.ico diff --git a/samples/TestLua/proj.win32/resource.h b/samples/test-lua/proj.win32/resource.h similarity index 100% rename from samples/TestLua/proj.win32/resource.h rename to samples/test-lua/proj.win32/resource.h From 3592873e2f65007fbec76878582fde534d8a1b6f Mon Sep 17 00:00:00 2001 From: James Chen Date: Tue, 28 Jan 2014 11:40:27 +0800 Subject: [PATCH 06/23] issue #3828: Moves submodule of JStest. --- .gitmodules | 4 ++-- samples/{TestJavascript => test-javascript}/tests | 0 2 files changed, 2 insertions(+), 2 deletions(-) rename samples/{TestJavascript => test-javascript}/tests (100%) diff --git a/.gitmodules b/.gitmodules index 717360b685..79f35bc6d6 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,8 +4,8 @@ [submodule "cocos/scripting/auto-generated"] path = cocos/scripting/auto-generated url = git://github.com/cocos2d-x/bindings-auto-generated.git -[submodule "samples/TestJavascript/tests"] - path = samples/TestJavascript/tests +[submodule "samples/test-javascript/tests"] + path = samples/test-javascript/tests url = git://github.com/cocos2d/cocos2d-js-tests.git [submodule "tools/cocos2d-console"] path = tools/cocos2d-console diff --git a/samples/TestJavascript/tests b/samples/test-javascript/tests similarity index 100% rename from samples/TestJavascript/tests rename to samples/test-javascript/tests From d1d447b52ecb3f88fd90d63e980b87538f49b8a9 Mon Sep 17 00:00:00 2001 From: James Chen Date: Tue, 28 Jan 2014 12:55:06 +0800 Subject: [PATCH 07/23] issue #3828: Updates iOS & Mac projects. And update JS-Tests. --- build/cocos2d_samples.xcodeproj/project.pbxproj.REMOVED.git-id | 2 +- samples/test-javascript/tests | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/cocos2d_samples.xcodeproj/project.pbxproj.REMOVED.git-id b/build/cocos2d_samples.xcodeproj/project.pbxproj.REMOVED.git-id index 3389050ae0..3b9ee9d97c 100644 --- a/build/cocos2d_samples.xcodeproj/project.pbxproj.REMOVED.git-id +++ b/build/cocos2d_samples.xcodeproj/project.pbxproj.REMOVED.git-id @@ -1 +1 @@ -c958533394964fe0c38bd60c272a0b48ec38d9d6 \ No newline at end of file +fc1947a565933ae570d1ba0e47e9d6b442498da5 \ No newline at end of file diff --git a/samples/test-javascript/tests b/samples/test-javascript/tests index 67ef9b611f..f32ebfa7b8 160000 --- a/samples/test-javascript/tests +++ b/samples/test-javascript/tests @@ -1 +1 @@ -Subproject commit 67ef9b611f26a3da00d907b0a36903a929730baa +Subproject commit f32ebfa7b8fd88b3e728681ce24dd3dd4094d766 From c2f1fbc4c13edc2bc7d262ca75e94e28a1f6ef95 Mon Sep 17 00:00:00 2001 From: James Chen Date: Tue, 28 Jan 2014 14:52:47 +0800 Subject: [PATCH 08/23] issue #3828: Updates CMakeLists.txt. Removes unused CMakeLists.txt. --- CMakeLists.txt | 4 ++-- samples/CMakeLists.txt | 7 ------- 2 files changed, 2 insertions(+), 9 deletions(-) delete mode 100644 samples/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index d143bf134e..05d11a0162 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -282,10 +282,10 @@ endif(BUILD_LIBS_LUA) # build samples if(BUILD_TestCpp) -add_subdirectory(samples/Cpp/TestCpp) +add_subdirectory(samples/test-cpp) endif(BUILD_TestCpp) if(BUILD_TestLua) -add_subdirectory(samples/Lua/TestLua) +add_subdirectory(samples/test-lua) endif(BUILD_TestLua) diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt deleted file mode 100644 index b1d1a01015..0000000000 --- a/samples/CMakeLists.txt +++ /dev/null @@ -1,7 +0,0 @@ -if(BUILD_TestCpp) -add_subdirectory(TestCpp) -endif(BUILD_TestCpp) - -if(BUILD_TestLua) -add_subdirectory(TestLua) -endif(BUILD_TestLua) From f6fa26d2517d52412c3bb07dc2e2ca0f159dc5c4 Mon Sep 17 00:00:00 2001 From: James Chen Date: Mon, 27 Jan 2014 23:10:11 -0800 Subject: [PATCH 09/23] issue #3828: Updates CMakeLists.txt of testlua. --- samples/test-lua/CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/samples/test-lua/CMakeLists.txt b/samples/test-lua/CMakeLists.txt index bc9427168f..4c75d70b40 100644 --- a/samples/test-lua/CMakeLists.txt +++ b/samples/test-lua/CMakeLists.txt @@ -7,9 +7,9 @@ set(SAMPLE_SRC include_directories( Classes - ../../../cocos/scripting/lua/bindings - ../../../external/lua/lua - ../../../external/lua/tolua + ../../cocos/scripting/lua/bindings + ../../external/lua/lua + ../../external/lua/tolua ) # add the executable @@ -37,6 +37,6 @@ pre_build(${APP_NAME} COMMAND ${CMAKE_COMMAND} -E remove_directory ${APP_BIN_DIR}/Resources COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/Resources ${APP_BIN_DIR}/Resources COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/cocos/scripting/lua/script ${APP_BIN_DIR}/Resources - COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/samples/Cpp/TestCpp/Resources ${APP_BIN_DIR}/Resources + COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/samples/test-cpp/Resources ${APP_BIN_DIR}/Resources ) From 8c9b4f27c6b6adfd0d5babfaebf7d9d99cecf315 Mon Sep 17 00:00:00 2001 From: James Chen Date: Tue, 28 Jan 2014 14:59:27 +0800 Subject: [PATCH 10/23] issue #3828: Removes unused files generated by eclipse. --- samples/test-cpp/.cproject | 114 ------------------ .../Javah_jni_builder.launch | 11 -- .../Javah_jni_builder.launch | 11 -- .../org.eclipse.cdt.codan.core.prefs | 68 ----------- .../proj.android/.settings/.jsdtscope | 6 - .../org.eclipse.cdt.codan.core.prefs | 68 ----------- .../.settings/org.eclipse.wst.jsdt.ui.prefs | 2 - ...rg.eclipse.wst.jsdt.ui.superType.container | 1 - .../org.eclipse.wst.jsdt.ui.superType.name | 1 - 9 files changed, 282 deletions(-) delete mode 100644 samples/test-cpp/.cproject delete mode 100644 samples/test-cpp/.externalToolBuilders/Javah_jni_builder.launch delete mode 100644 samples/test-cpp/proj.android/.externalToolBuilders/Javah_jni_builder.launch delete mode 100644 samples/test-cpp/proj.android/.settings/org.eclipse.cdt.codan.core.prefs delete mode 100644 samples/test-javascript/proj.android/.settings/.jsdtscope delete mode 100644 samples/test-javascript/proj.android/.settings/org.eclipse.cdt.codan.core.prefs delete mode 100644 samples/test-javascript/proj.android/.settings/org.eclipse.wst.jsdt.ui.prefs delete mode 100644 samples/test-javascript/proj.android/.settings/org.eclipse.wst.jsdt.ui.superType.container delete mode 100644 samples/test-javascript/proj.android/.settings/org.eclipse.wst.jsdt.ui.superType.name diff --git a/samples/test-cpp/.cproject b/samples/test-cpp/.cproject deleted file mode 100644 index fc4e7a2557..0000000000 --- a/samples/test-cpp/.cproject +++ /dev/null @@ -1,114 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/samples/test-cpp/.externalToolBuilders/Javah_jni_builder.launch b/samples/test-cpp/.externalToolBuilders/Javah_jni_builder.launch deleted file mode 100644 index 3506e4e944..0000000000 --- a/samples/test-cpp/.externalToolBuilders/Javah_jni_builder.launch +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/samples/test-cpp/proj.android/.externalToolBuilders/Javah_jni_builder.launch b/samples/test-cpp/proj.android/.externalToolBuilders/Javah_jni_builder.launch deleted file mode 100644 index 3506e4e944..0000000000 --- a/samples/test-cpp/proj.android/.externalToolBuilders/Javah_jni_builder.launch +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/samples/test-cpp/proj.android/.settings/org.eclipse.cdt.codan.core.prefs b/samples/test-cpp/proj.android/.settings/org.eclipse.cdt.codan.core.prefs deleted file mode 100644 index bad4196993..0000000000 --- a/samples/test-cpp/proj.android/.settings/org.eclipse.cdt.codan.core.prefs +++ /dev/null @@ -1,68 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.cdt.codan.checkers.errnoreturn=-Warning -org.eclipse.cdt.codan.checkers.errnoreturn.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},implicit\=>false} -org.eclipse.cdt.codan.checkers.errreturnvalue=-Error -org.eclipse.cdt.codan.checkers.errreturnvalue.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.checkers.noreturn=-Error -org.eclipse.cdt.codan.checkers.noreturn.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},implicit\=>false} -org.eclipse.cdt.codan.internal.checkers.AbstractClassCreation=-Error -org.eclipse.cdt.codan.internal.checkers.AbstractClassCreation.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.AmbiguousProblem=-Error -org.eclipse.cdt.codan.internal.checkers.AmbiguousProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.AssignmentInConditionProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.AssignmentInConditionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.AssignmentToItselfProblem=-Error -org.eclipse.cdt.codan.internal.checkers.AssignmentToItselfProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.CaseBreakProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.CaseBreakProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},no_break_comment\=>"no break",last_case_param\=>true,empty_case_param\=>false} -org.eclipse.cdt.codan.internal.checkers.CatchByReference=-Warning -org.eclipse.cdt.codan.internal.checkers.CatchByReference.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},unknown\=>false,exceptions\=>()} -org.eclipse.cdt.codan.internal.checkers.CircularReferenceProblem=-Error -org.eclipse.cdt.codan.internal.checkers.CircularReferenceProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.ClassMembersInitialization=-Warning -org.eclipse.cdt.codan.internal.checkers.ClassMembersInitialization.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},skip\=>true} -org.eclipse.cdt.codan.internal.checkers.FieldResolutionProblem=-Error -org.eclipse.cdt.codan.internal.checkers.FieldResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.FunctionResolutionProblem=-Error -org.eclipse.cdt.codan.internal.checkers.FunctionResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.InvalidArguments=-Error -org.eclipse.cdt.codan.internal.checkers.InvalidArguments.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.InvalidTemplateArgumentsProblem=-Error -org.eclipse.cdt.codan.internal.checkers.InvalidTemplateArgumentsProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.LabelStatementNotFoundProblem=-Error -org.eclipse.cdt.codan.internal.checkers.LabelStatementNotFoundProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.MemberDeclarationNotFoundProblem=-Error -org.eclipse.cdt.codan.internal.checkers.MemberDeclarationNotFoundProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.MethodResolutionProblem=-Error -org.eclipse.cdt.codan.internal.checkers.MethodResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.NamingConventionFunctionChecker=-Info -org.eclipse.cdt.codan.internal.checkers.NamingConventionFunctionChecker.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},pattern\=>"^[a-z]",macro\=>true,exceptions\=>()} -org.eclipse.cdt.codan.internal.checkers.NonVirtualDestructorProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.NonVirtualDestructorProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.OverloadProblem=-Error -org.eclipse.cdt.codan.internal.checkers.OverloadProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.RedeclarationProblem=-Error -org.eclipse.cdt.codan.internal.checkers.RedeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.RedefinitionProblem=-Error -org.eclipse.cdt.codan.internal.checkers.RedefinitionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.ReturnStyleProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.ReturnStyleProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.ScanfFormatStringSecurityProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.ScanfFormatStringSecurityProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.StatementHasNoEffectProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.StatementHasNoEffectProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true,exceptions\=>()} -org.eclipse.cdt.codan.internal.checkers.SuggestedParenthesisProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.SuggestedParenthesisProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},paramNot\=>false} -org.eclipse.cdt.codan.internal.checkers.SuspiciousSemicolonProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.SuspiciousSemicolonProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},else\=>false,afterelse\=>false} -org.eclipse.cdt.codan.internal.checkers.TypeResolutionProblem=-Error -org.eclipse.cdt.codan.internal.checkers.TypeResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.UnusedFunctionDeclarationProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.UnusedFunctionDeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true} -org.eclipse.cdt.codan.internal.checkers.UnusedStaticFunctionProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.UnusedStaticFunctionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true} -org.eclipse.cdt.codan.internal.checkers.UnusedVariableDeclarationProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.UnusedVariableDeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true,exceptions\=>("@(\#)","$Id")} -org.eclipse.cdt.codan.internal.checkers.VariableResolutionProblem=-Error -org.eclipse.cdt.codan.internal.checkers.VariableResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -useParentScope=false diff --git a/samples/test-javascript/proj.android/.settings/.jsdtscope b/samples/test-javascript/proj.android/.settings/.jsdtscope deleted file mode 100644 index bbf7a521cc..0000000000 --- a/samples/test-javascript/proj.android/.settings/.jsdtscope +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/samples/test-javascript/proj.android/.settings/org.eclipse.cdt.codan.core.prefs b/samples/test-javascript/proj.android/.settings/org.eclipse.cdt.codan.core.prefs deleted file mode 100644 index bad4196993..0000000000 --- a/samples/test-javascript/proj.android/.settings/org.eclipse.cdt.codan.core.prefs +++ /dev/null @@ -1,68 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.cdt.codan.checkers.errnoreturn=-Warning -org.eclipse.cdt.codan.checkers.errnoreturn.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},implicit\=>false} -org.eclipse.cdt.codan.checkers.errreturnvalue=-Error -org.eclipse.cdt.codan.checkers.errreturnvalue.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.checkers.noreturn=-Error -org.eclipse.cdt.codan.checkers.noreturn.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},implicit\=>false} -org.eclipse.cdt.codan.internal.checkers.AbstractClassCreation=-Error -org.eclipse.cdt.codan.internal.checkers.AbstractClassCreation.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.AmbiguousProblem=-Error -org.eclipse.cdt.codan.internal.checkers.AmbiguousProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.AssignmentInConditionProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.AssignmentInConditionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.AssignmentToItselfProblem=-Error -org.eclipse.cdt.codan.internal.checkers.AssignmentToItselfProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.CaseBreakProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.CaseBreakProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},no_break_comment\=>"no break",last_case_param\=>true,empty_case_param\=>false} -org.eclipse.cdt.codan.internal.checkers.CatchByReference=-Warning -org.eclipse.cdt.codan.internal.checkers.CatchByReference.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},unknown\=>false,exceptions\=>()} -org.eclipse.cdt.codan.internal.checkers.CircularReferenceProblem=-Error -org.eclipse.cdt.codan.internal.checkers.CircularReferenceProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.ClassMembersInitialization=-Warning -org.eclipse.cdt.codan.internal.checkers.ClassMembersInitialization.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},skip\=>true} -org.eclipse.cdt.codan.internal.checkers.FieldResolutionProblem=-Error -org.eclipse.cdt.codan.internal.checkers.FieldResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.FunctionResolutionProblem=-Error -org.eclipse.cdt.codan.internal.checkers.FunctionResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.InvalidArguments=-Error -org.eclipse.cdt.codan.internal.checkers.InvalidArguments.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.InvalidTemplateArgumentsProblem=-Error -org.eclipse.cdt.codan.internal.checkers.InvalidTemplateArgumentsProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.LabelStatementNotFoundProblem=-Error -org.eclipse.cdt.codan.internal.checkers.LabelStatementNotFoundProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.MemberDeclarationNotFoundProblem=-Error -org.eclipse.cdt.codan.internal.checkers.MemberDeclarationNotFoundProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.MethodResolutionProblem=-Error -org.eclipse.cdt.codan.internal.checkers.MethodResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.NamingConventionFunctionChecker=-Info -org.eclipse.cdt.codan.internal.checkers.NamingConventionFunctionChecker.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},pattern\=>"^[a-z]",macro\=>true,exceptions\=>()} -org.eclipse.cdt.codan.internal.checkers.NonVirtualDestructorProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.NonVirtualDestructorProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.OverloadProblem=-Error -org.eclipse.cdt.codan.internal.checkers.OverloadProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.RedeclarationProblem=-Error -org.eclipse.cdt.codan.internal.checkers.RedeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.RedefinitionProblem=-Error -org.eclipse.cdt.codan.internal.checkers.RedefinitionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.ReturnStyleProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.ReturnStyleProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.ScanfFormatStringSecurityProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.ScanfFormatStringSecurityProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.StatementHasNoEffectProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.StatementHasNoEffectProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true,exceptions\=>()} -org.eclipse.cdt.codan.internal.checkers.SuggestedParenthesisProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.SuggestedParenthesisProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},paramNot\=>false} -org.eclipse.cdt.codan.internal.checkers.SuspiciousSemicolonProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.SuspiciousSemicolonProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},else\=>false,afterelse\=>false} -org.eclipse.cdt.codan.internal.checkers.TypeResolutionProblem=-Error -org.eclipse.cdt.codan.internal.checkers.TypeResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.UnusedFunctionDeclarationProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.UnusedFunctionDeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true} -org.eclipse.cdt.codan.internal.checkers.UnusedStaticFunctionProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.UnusedStaticFunctionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true} -org.eclipse.cdt.codan.internal.checkers.UnusedVariableDeclarationProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.UnusedVariableDeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true,exceptions\=>("@(\#)","$Id")} -org.eclipse.cdt.codan.internal.checkers.VariableResolutionProblem=-Error -org.eclipse.cdt.codan.internal.checkers.VariableResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -useParentScope=false diff --git a/samples/test-javascript/proj.android/.settings/org.eclipse.wst.jsdt.ui.prefs b/samples/test-javascript/proj.android/.settings/org.eclipse.wst.jsdt.ui.prefs deleted file mode 100644 index 6bf5ec1a0a..0000000000 --- a/samples/test-javascript/proj.android/.settings/org.eclipse.wst.jsdt.ui.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.wst.jsdt.ui.text.custom_code_templates= diff --git a/samples/test-javascript/proj.android/.settings/org.eclipse.wst.jsdt.ui.superType.container b/samples/test-javascript/proj.android/.settings/org.eclipse.wst.jsdt.ui.superType.container deleted file mode 100644 index 3bd5d0a480..0000000000 --- a/samples/test-javascript/proj.android/.settings/org.eclipse.wst.jsdt.ui.superType.container +++ /dev/null @@ -1 +0,0 @@ -org.eclipse.wst.jsdt.launching.baseBrowserLibrary \ No newline at end of file diff --git a/samples/test-javascript/proj.android/.settings/org.eclipse.wst.jsdt.ui.superType.name b/samples/test-javascript/proj.android/.settings/org.eclipse.wst.jsdt.ui.superType.name deleted file mode 100644 index 05bd71b6ec..0000000000 --- a/samples/test-javascript/proj.android/.settings/org.eclipse.wst.jsdt.ui.superType.name +++ /dev/null @@ -1 +0,0 @@ -Window \ No newline at end of file From 5d67d53393720b6c7db0cfd4a532e3f0518d4e3d Mon Sep 17 00:00:00 2001 From: James Chen Date: Tue, 28 Jan 2014 15:14:07 +0800 Subject: [PATCH 11/23] issue #3828: Updates android build. --- build/android-build.py | 78 +++++--------------- samples/test-cpp/proj.android/jni/Android.mk | 2 +- 2 files changed, 20 insertions(+), 60 deletions(-) diff --git a/build/android-build.py b/build/android-build.py index bc00812ace..3d20a8a40d 100755 --- a/build/android-build.py +++ b/build/android-build.py @@ -7,9 +7,9 @@ import os, os.path import shutil from optparse import OptionParser -CPP_SAMPLES = ['hellocpp', 'testcpp', 'simplegame', 'assetsmanager'] -LUA_SAMPLES = ['hellolua', 'testlua'] -JSB_SAMPLES = ['cocosdragon', 'crystalcraze', 'moonwarriors', 'testjavascript', 'watermelonwithme'] +CPP_SAMPLES = ['testcpp'] +LUA_SAMPLES = ['testlua'] +JSB_SAMPLES = ['testjavascript'] ALL_SAMPLES = CPP_SAMPLES + LUA_SAMPLES + JSB_SAMPLES def get_num_of_cpu(): @@ -159,47 +159,23 @@ def copy_resources(target, app_android_root): # jsb samples should copy javascript files and resources(shared with cocos2d-html5) if target in JSB_SAMPLES: - resources_dir = os.path.join(app_android_root, "../../../../cocos/scripting/javascript/script") + resources_dir = os.path.join(app_android_root, "../../../cocos/scripting/javascript/script") copy_files(resources_dir, assets_dir) - if target == "cocosdragon": - resources_dir = os.path.join(app_android_root, "../../Shared/games/CocosDragonJS/Published files Android") - if target == "crystalcraze": - resources_dir = os.path.join(app_android_root, "../../Shared/games/CrystalCraze/Published-Android") if target == "testjavascript": - resources_dir = os.path.join(app_android_root, "../../Shared/tests/") - if target == "watermelonwithme": - resources_dir = os.path.join(app_android_root, "../../Shared/games/WatermelonWithMe") - if target != "moonwarriors": - copy_files(resources_dir, assets_dir) - else: - resources_dir = os.path.join(app_android_root, "../../Shared/games/MoonWarriors/res") - dst_dir = os.path.join(assets_dir, "res") - os.mkdir(dst_dir) - copy_files(resources_dir, dst_dir) - resources_dir = os.path.join(app_android_root, "../../Shared/games/MoonWarriors/src") - dst_dir = os.path.join(assets_dir, "src") - os.mkdir(dst_dir) - copy_files(resources_dir, dst_dir) - resources_dir = os.path.join(app_android_root, "../../Shared/games/MoonWarriors") - for item in os.listdir(resources_dir): - path = os.path.join(resources_dir, item) - if item.endswith('.js') and os.path.isfile(path): - shutil.copy(path, assets_dir) + resources_dir = os.path.join(app_android_root, "../../tests/") - # AssetsManager test should also copy javascript files - if target == "assetsmanager": - resources_dir = os.path.join(app_android_root, "../../../../cocos/scripting/javascript/script") copy_files(resources_dir, assets_dir) + # lua samples should copy lua script if target in LUA_SAMPLES: - resources_dir = os.path.join(app_android_root, "../../../../cocos/scripting/lua/script") + resources_dir = os.path.join(app_android_root, "../../../cocos/scripting/lua/script") copy_files(resources_dir, assets_dir) # TestLua shared resources with TestCpp if target == "testlua": - resources_dir = os.path.join(app_android_root, "../../../Cpp/TestCpp/Resources") + resources_dir = os.path.join(app_android_root, "../../test-cpp/Resources") copy_files(resources_dir, assets_dir) def build_samples(target,ndk_build_param,android_platform,build_mode): @@ -227,28 +203,12 @@ def build_samples(target,ndk_build_param,android_platform,build_mode): app_android_root = '' for target in build_targets: - if target == 'hellocpp': - app_android_root = os.path.join(cocos_root, 'samples/Cpp/HelloCpp/proj.android') elif target == 'testcpp': - app_android_root = os.path.join(cocos_root, 'samples/Cpp/TestCpp/proj.android') - elif target == 'simplegame': - app_android_root = os.path.join(cocos_root, 'samples/Cpp/SimpleGame/proj.android') - elif target == 'assetsmanager': - app_android_root = os.path.join(cocos_root, 'samples/Cpp/AssetsManagerTest/proj.android') - elif target == 'hellolua': - app_android_root = os.path.join(cocos_root, 'samples/Lua/HelloLua/proj.android') + app_android_root = os.path.join(cocos_root, 'samples/test-cpp/proj.android') elif target == 'testlua': - app_android_root = os.path.join(cocos_root, 'samples/Lua/TestLua/proj.android') - elif target == 'cocosdragon': - app_android_root = os.path.join(cocos_root, 'samples/Javascript/CocosDragonJS/proj.android') - elif target == 'crystalcraze': - app_android_root = os.path.join(cocos_root, 'samples/Javascript/CrystalCraze/proj.android') - elif target == 'moonwarriors': - app_android_root = os.path.join(cocos_root, 'samples/Javascript/MoonWarriors/proj.android') + app_android_root = os.path.join(cocos_root, 'samples/test-lua/proj.android') elif target == 'testjavascript': - app_android_root = os.path.join(cocos_root, 'samples/Javascript/TestJavascript/proj.android') - elif target == 'watermelonwithme': - app_android_root = os.path.join(cocos_root, 'samples/Javascript/WatermelonWithMe/proj.android') + app_android_root = os.path.join(cocos_root, 'samples/test-javascript/proj.android') else: print 'unknown target: %s' % target continue @@ -265,24 +225,24 @@ if __name__ == '__main__': Usage: %prog [options] target - Valid targets are: [hellocpp|testcpp|simplegame|assetsmanager|hellolua|testlua|cocosdragon|crystalcraze|moonwarriors|testjavascript|watermelonwithme]. You can combine them arbitrarily with a whitespace among two valid targets. + Valid targets are: [testcpp|testlua|testjavascript]. You can combine them arbitrarily with a whitespace among two valid targets. You can use [all|cpp|lua|jsb], to build all the samples, or all the c++ samples, or all the lua samples, or all the jsb samples respectevely. - cpp = ['hellocpp', 'testcpp', 'simplegame', 'assetsmanager'] - lua = ['hellolua', 'testlua'] - jsb = ['cocosdragon', 'crystalcraze', 'moonwarriors', 'testjavascript', 'watermelonwithme'] + cpp = ['testcpp'] + lua = ['testlua'] + jsb = ['testjavascript'] all = cpp + lua + jsb // be careful with the all target, it may took a very long time to compile all the projects, do it under your own risk. - If you are new to cocos2d-x, I recommend you start with hellocpp,hellolua or testjavascript. + If you are new to cocos2d-x, I recommend you start with testcpp, testlua or testjavascript. You can combine these targets like this: //1. to build simplegame and assetsmanager - python android-build.py -p 10 simplegame assetsmanager + python android-build.py -p 10 testcpp testlua - //2. to build hellolua and all the jsb samples - python android-build.py -p 19 hellolua jsb + //2. to build testlua and all the jsb samples + python android-build.py -p 19 testlua jsb Note: You should install ant to generate apk while building the andriod samples. But it is optional. You can generate apk with eclipse. """ diff --git a/samples/test-cpp/proj.android/jni/Android.mk b/samples/test-cpp/proj.android/jni/Android.mk index 7867f3f1fb..ddcf40f4cc 100644 --- a/samples/test-cpp/proj.android/jni/Android.mk +++ b/samples/test-cpp/proj.android/jni/Android.mk @@ -14,4 +14,4 @@ LOCAL_WHOLE_STATIC_LIBRARIES := cocos_testcpp_common include $(BUILD_SHARED_LIBRARY) -$(call import-module,samples/Cpp/TestCpp) +$(call import-module,samples/test-cpp) From ebe22aaeec6bd65149da778c9492153a652410d6 Mon Sep 17 00:00:00 2001 From: James Chen Date: Tue, 28 Jan 2014 15:17:34 +0800 Subject: [PATCH 12/23] issue #3828: Fix a mistake in android-build.py. --- build/android-build.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/android-build.py b/build/android-build.py index 3d20a8a40d..13ed0b0499 100755 --- a/build/android-build.py +++ b/build/android-build.py @@ -203,7 +203,7 @@ def build_samples(target,ndk_build_param,android_platform,build_mode): app_android_root = '' for target in build_targets: - elif target == 'testcpp': + if target == 'testcpp': app_android_root = os.path.join(cocos_root, 'samples/test-cpp/proj.android') elif target == 'testlua': app_android_root = os.path.join(cocos_root, 'samples/test-lua/proj.android') From ffd8970996b59d70260ab4b88b76a7dfa5299e81 Mon Sep 17 00:00:00 2001 From: James Chen Date: Tue, 28 Jan 2014 15:33:23 +0800 Subject: [PATCH 13/23] issue #3828: Updates android build. --- build/android-build.py | 14 +++++++------- samples/test-lua/proj.android/jni/Android.mk | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/build/android-build.py b/build/android-build.py index 13ed0b0499..c66414d47b 100755 --- a/build/android-build.py +++ b/build/android-build.py @@ -163,7 +163,7 @@ def copy_resources(target, app_android_root): copy_files(resources_dir, assets_dir) if target == "testjavascript": - resources_dir = os.path.join(app_android_root, "../../tests/") + resources_dir = os.path.join(app_android_root, "../tests/") copy_files(resources_dir, assets_dir) @@ -189,12 +189,12 @@ def build_samples(target,ndk_build_param,android_platform,build_mode): cocos_root = os.path.join(current_dir, "..") if android_platform is not None: - sdk_root = check_environment_variables_sdk() - if android_platform.isdigit(): - android_platform = 'android-'+android_platform - else: - print 'please use vaild android platform' - exit(1) + sdk_root = check_environment_variables_sdk() + if android_platform.isdigit(): + android_platform = 'android-'+android_platform + else: + print 'please use vaild android platform' + exit(1) if build_mode is None: build_mode = 'debug' diff --git a/samples/test-lua/proj.android/jni/Android.mk b/samples/test-lua/proj.android/jni/Android.mk index 4bc4ceafb3..e75e0de694 100644 --- a/samples/test-lua/proj.android/jni/Android.mk +++ b/samples/test-lua/proj.android/jni/Android.mk @@ -12,9 +12,9 @@ LOCAL_SRC_FILES += testlua/main.cpp \ LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../Classes \ - $(LOCAL_PATH)/../../../../../external/lua/tolua \ - $(LOCAL_PATH)/../../../../../extensions \ - $(LOCAL_PATH)/../../../../../cocos/scripting/lua/bindings + $(LOCAL_PATH)/../../../../external/lua/tolua \ + $(LOCAL_PATH)/../../../../extensions \ + $(LOCAL_PATH)/../../../../cocos/scripting/lua/bindings LOCAL_STATIC_LIBRARIES := curl_static_prebuilt From a00b4a7c494c041f7f2db204901069e5c579edf2 Mon Sep 17 00:00:00 2001 From: James Chen Date: Tue, 28 Jan 2014 15:38:07 +0800 Subject: [PATCH 14/23] issue #3828: Updates JS-Test. --- samples/test-javascript/tests | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/test-javascript/tests b/samples/test-javascript/tests index f32ebfa7b8..7a9a69a414 160000 --- a/samples/test-javascript/tests +++ b/samples/test-javascript/tests @@ -1 +1 @@ -Subproject commit f32ebfa7b8fd88b3e728681ce24dd3dd4094d766 +Subproject commit 7a9a69a41480127a1572a4983eb9b5f1cbf2e186 From 6988d48d087fde7b200ccba85e62bdfc0041fac6 Mon Sep 17 00:00:00 2001 From: James Chen Date: Tue, 28 Jan 2014 15:49:23 +0800 Subject: [PATCH 15/23] issue #3828: Updates win32 projects. --- build/cocos2d-win32.vc2012.sln | 22 +------ samples/test-cpp/proj.win32/TestCpp.vcxproj | 34 +++++----- .../proj.win32/TestJavascript.vcxproj | 64 +++++++++---------- .../test-lua/proj.win32/TestLua.win32.vcxproj | 40 ++++++------ 4 files changed, 72 insertions(+), 88 deletions(-) diff --git a/build/cocos2d-win32.vc2012.sln b/build/cocos2d-win32.vc2012.sln index 3593a117d8..50995fc7e3 100644 --- a/build/cocos2d-win32.vc2012.sln +++ b/build/cocos2d-win32.vc2012.sln @@ -5,15 +5,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libAudio", "..\cocos\audio\ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos2d", "..\cocos\2d\cocos2d.vcxproj", "{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloCpp", "..\samples\Cpp\HelloCpp\proj.win32\HelloCpp.vcxproj", "{B8BF9E81-35FD-4582-BA1C-B85FA365BABB}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libBox2D", "..\external\Box2D\proj.win32\Box2D.vcxproj", "{929480E7-23C0-4DF6-8456-096D71547116}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libchipmunk", "..\external\chipmunk\proj.win32\chipmunk.vcxproj", "{207BC7A9-CCF1-4F2F-A04D-45F72242AE25}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libExtensions", "..\extensions\proj.win32\libExtensions.vcxproj", "{21B2C324-891F-48EA-AD1A-5AE13DE12E28}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestCpp", "..\samples\Cpp\TestCpp\proj.win32\TestCpp.vcxproj", "{76A39BB2-9B84-4C65-98A5-654D86B86F2A}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestCpp", "..\samples\test-cpp\proj.win32\TestCpp.vcxproj", "{76A39BB2-9B84-4C65-98A5-654D86B86F2A}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCocosBuilder", "..\cocos\editor-support\cocosbuilder\proj.win32\libCocosBuilder.vcxproj", "{811C0DAB-7B96-4BD3-A154-B7572B58E4AB}" EndProject @@ -25,29 +23,15 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libNetwork", "..\cocos\netw EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libSpine", "..\cocos\editor-support\spine\proj.win32\libSpine.vcxproj", "{B7C2A162-DEC9-4418-972E-240AB3CBFCAE}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AssetsManagerTest", "..\samples\Cpp\AssetsManagerTest\proj.win32\AssetsManagerTest.vcxproj", "{6D37505F-A890-441D-BD3F-A61E2C0469CE}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libJSBinding", "..\cocos\scripting\javascript\bindings\proj.win32\libJSBinding.vcxproj", "{39379840-825A-45A0-B363-C09FFEF864BD}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestJavascript", "..\samples\Javascript\TestJavascript\proj.win32\TestJavascript.vcxproj", "{D0F06A44-A245-4D13-A498-0120C203B539}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestJavascript", "..\samples\test-javascript\proj.win32\TestJavascript.vcxproj", "{D0F06A44-A245-4D13-A498-0120C203B539}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libLocalStorage", "..\cocos\storage\local-storage\proj.win32\libLocalStorage.vcxproj", "{632A8F38-D0F0-4D22-86B3-D69F5E6BF63A}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CocosDragonJS", "..\samples\Javascript\CocosDragonJS\proj.win32\CocosDragonJS.vcxproj", "{68ED0B4E-2BCA-45D2-9648-CEABEBD3B9D7}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CrystalCraze", "..\samples\Javascript\CrystalCraze\proj.win32\CrystalCraze.vcxproj", "{9A17D9A4-4B11-4E32-94F6-895FF4909EC5}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MoonWarriors", "..\samples\Javascript\MoonWarriors\proj.win32\MoonWarriors.vcxproj", "{1DB7C0FC-46FF-4A1B-82E0-C6244EEEC4C2}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WatermelonWithMe", "..\samples\Javascript\WatermelonWithMe\proj.win32\WatermelonWithMe.vcxproj", "{BE092D9E-95AE-4F86-84CE-F4519E4F3F15}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblua", "..\cocos\scripting\lua\bindings\liblua.vcxproj", "{DDC3E27F-004D-4DD4-9DD3-931A013D2159}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloLua", "..\samples\Lua\HelloLua\proj.win32\HelloLua.vcxproj", "{13E55395-94A2-4CD9-BFC2-1A051F80C17D}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestLua", "..\samples\Lua\TestLua\proj.win32\TestLua.win32.vcxproj", "{4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SimpleGame", "..\samples\Cpp\SimpleGame\proj.win32\SimpleGame.vcxproj", "{E0E282F4-8487-452C-BFAB-CB960EB4D22F}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestLua", "..\samples\test-lua\proj.win32\TestLua.win32.vcxproj", "{4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libJSBindingForBuilder", "..\cocos\scripting\javascript\bindings\cocosbuilder\libJSBindingForBuilder.vcxproj", "{F9DA0FC1-651B-457B-962E-A4D61CEBF5FD}" EndProject diff --git a/samples/test-cpp/proj.win32/TestCpp.vcxproj b/samples/test-cpp/proj.win32/TestCpp.vcxproj index 620b12b3f1..df8f3b6dc7 100644 --- a/samples/test-cpp/proj.win32/TestCpp.vcxproj +++ b/samples/test-cpp/proj.win32/TestCpp.vcxproj @@ -36,13 +36,13 @@ - - + + - - + + @@ -94,7 +94,7 @@ if not exist "$(OutDir)" mkdir "$(OutDir)" -xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\websockets\prebuilt\win32\*.*" "$(OutDir)" +xcopy /Y /Q "$(ProjectDir)..\..\..\external\websockets\prebuilt\win32\*.*" "$(OutDir)" @@ -130,7 +130,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\websockets\prebuilt\win32\*.*" "$ if not exist "$(OutDir)" mkdir "$(OutDir)" -xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\websockets\prebuilt\win32\*.*" "$(OutDir)" +xcopy /Y /Q "$(ProjectDir)..\..\..\external\websockets\prebuilt\win32\*.*" "$(OutDir)" @@ -485,41 +485,41 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\websockets\prebuilt\win32\*.*" "$ - + {98a51ba8-fc3a-415b-ac8f-8c7bd464e93e} false - + {f8edd7fa-9a51-4e80-baeb-860825d2eac6} false - + {811c0dab-7b96-4bd3-a154-b7572b58e4ab} - + {b57cf53f-2e49-4031-9822-047cc0e6bde2} - + {b7c2a162-dec9-4418-972e-240ab3cbfcae} - + {7e06e92c-537a-442b-9e4a-4761c84f8a1a} - + {df2638c0-8128-4847-867c-6eafe3dee7b5} - + {632a8f38-d0f0-4d22-86b3-d69f5e6bf63a} - + {21b2c324-891f-48ea-ad1a-5ae13de12e28} false - + {929480e7-23c0-4df6-8456-096d71547116} false - + {207bc7a9-ccf1-4f2f-a04d-45f72242ae25} false diff --git a/samples/test-javascript/proj.win32/TestJavascript.vcxproj b/samples/test-javascript/proj.win32/TestJavascript.vcxproj index e3be6f4245..826bc21ee7 100644 --- a/samples/test-javascript/proj.win32/TestJavascript.vcxproj +++ b/samples/test-javascript/proj.win32/TestJavascript.vcxproj @@ -34,13 +34,13 @@ - - + + - - + + @@ -98,8 +98,8 @@ if not exist "$(OutDir)" mkdir "$(OutDir)" -xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\spidermonkey\prebuilt\win32\*.*" "$(OutDir)" -xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\websockets\prebuilt\win32\*.*" "$(OutDir)" +xcopy /Y /Q "$(ProjectDir)..\..\external\spidermonkey\prebuilt\win32\*.*" "$(OutDir)" +xcopy /Y /Q "$(ProjectDir)..\..\external\websockets\prebuilt\win32\*.*" "$(OutDir)" @@ -113,8 +113,8 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\websockets\prebuilt\win32\*.*" "$ if not exist "$(OutDir)" mkdir "$(OutDir)" if exist "$(OutDir)\TestJavascriptRes" rd /s /q "$(OutDir)\TestJavascriptRes" mkdir "$(OutDir)\TestJavascriptRes" -xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\javascript\script\*.js" "$(OutDir)\TestJavascriptRes\" /e /Y -xcopy "$(ProjectDir)..\..\Shared\tests" "$(OutDir)\TestJavascriptRes\" /e /Y +xcopy "$(ProjectDir)..\..\..\cocos\scripting\javascript\script\*.js" "$(OutDir)\TestJavascriptRes\" /e /Y +xcopy "$(ProjectDir)..\tests" "$(OutDir)\TestJavascriptRes\" /e /Y Copy js and resource files. @@ -154,8 +154,8 @@ xcopy "$(ProjectDir)..\..\Shared\tests" "$(OutDir)\TestJavascriptRes\" /e /Y if not exist "$(OutDir)" mkdir "$(OutDir)" -xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\spidermonkey\prebuilt\win32\*.*" "$(OutDir)" -xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\websockets\prebuilt\win32\*.*" "$(OutDir)" +xcopy /Y /Q "$(ProjectDir)..\..\external\spidermonkey\prebuilt\win32\*.*" "$(OutDir)" +xcopy /Y /Q "$(ProjectDir)..\..\external\websockets\prebuilt\win32\*.*" "$(OutDir)" @@ -169,8 +169,8 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\websockets\prebuilt\win32\*.*" "$ if not exist "$(OutDir)" mkdir "$(OutDir)" if exist "$(OutDir)\TestJavascriptRes" rd /s /q "$(OutDir)\TestJavascriptRes" mkdir "$(OutDir)\TestJavascriptRes" -xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\javascript\script\*.js" "$(OutDir)\TestJavascriptRes\" /e /Y -xcopy "$(ProjectDir)..\..\Shared\tests" "$(OutDir)\TestJavascriptRes\" /e /Y +xcopy "$(ProjectDir)..\..\..\cocos\scripting\javascript\script\*.js" "$(OutDir)\TestJavascriptRes\" /e /Y +xcopy "$(ProjectDir)..\tests" "$(OutDir)\TestJavascriptRes\" /e /Y Copy js and resource files. @@ -190,66 +190,66 @@ xcopy "$(ProjectDir)..\..\Shared\tests" "$(OutDir)\TestJavascriptRes\" /e /Y - + {98a51ba8-fc3a-415b-ac8f-8c7bd464e93e} false - + {f8edd7fa-9a51-4e80-baeb-860825d2eac6} false - + {811c0dab-7b96-4bd3-a154-b7572b58e4ab} - + {b57cf53f-2e49-4031-9822-047cc0e6bde2} - + {b7c2a162-dec9-4418-972e-240ab3cbfcae} - + {7e06e92c-537a-442b-9e4a-4761c84f8a1a} - + {df2638c0-8128-4847-867c-6eafe3dee7b5} - + {21070e58-eec6-4e16-8b4f-6d083df55790} - + {f9da0fc1-651b-457b-962e-a4d61cebf5fd} - + {79d34511-e54e-410a-8bba-ef175ad6c695} - + {625f7391-9a91-48a1-8cfc-79508c822637} - + {9a844c88-97e8-4e2d-b09a-e138c67d338b} - + {68f5f371-bd7b-4c30-ae5b-0b08f22e0cde} - + {3bec13f5-e227-4d80-bc77-1c857f83bcfc} - + {39379840-825a-45a0-b363-c09ffef864bd} - + {e78cdc6b-f37d-48d2-ad91-1db549497e32} - + {632a8f38-d0f0-4d22-86b3-d69f5e6bf63a} - + {21b2c324-891f-48ea-ad1a-5ae13de12e28} - + {929480e7-23c0-4df6-8456-096d71547116} - + {207bc7a9-ccf1-4f2f-a04d-45f72242ae25} diff --git a/samples/test-lua/proj.win32/TestLua.win32.vcxproj b/samples/test-lua/proj.win32/TestLua.win32.vcxproj index 7d04e0f16c..799ae15647 100644 --- a/samples/test-lua/proj.win32/TestLua.win32.vcxproj +++ b/samples/test-lua/proj.win32/TestLua.win32.vcxproj @@ -36,13 +36,13 @@ - - + + - - + + @@ -104,8 +104,8 @@ - xcopy "$(ProjectDir)..\..\..\Cpp\TestCpp\Resources" "$(ProjectDir)..\..\TestLua\Resources" /e /Y -xcopy "$(EngineRoot)cocos\scripting\lua\script" "$(ProjectDir)..\..\TestLua\Resources" /e /Y + xcopy "$(ProjectDir)..\..\test-cpp\Resources" "$(ProjectDir)..\Resources" /e /Y +xcopy "$(EngineRoot)cocos\scripting\lua\script" "$(ProjectDir)..\Resources" /e /Y copy files from TestCpp to TestLua @@ -152,13 +152,13 @@ xcopy /Y /Q "$(EngineRoot)external\websockets\prebuilt\\win32\*.*" "$(OutDir)" - xcopy "$(ProjectDir)..\..\..\Cpp\TestCpp\Resources" "$(ProjectDir)..\..\TestLua\Resources" /e /Y -xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua\script" "$(ProjectDir)..\..\TestLua\Resources" /e /Y + xcopy "$(ProjectDir)..\..\test-cpp\Resources" "$(ProjectDir)..\Resources" /e /Y +xcopy "$(EngineRoot)cocos\scripting\lua\script" "$(ProjectDir)..\Resources" /e /Y copy files from TestCpp to TestLua if not exist "$(OutDir)" mkdir "$(OutDir)" -xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\websockets\prebuilt\win32\*.*" "$(OutDir)" +xcopy /Y /Q "$(ProjectDir)..\..\..\external\websockets\prebuilt\win32\*.*" "$(OutDir)" @@ -172,37 +172,37 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\websockets\prebuilt\win32\*.*" "$ - + {98a51ba8-fc3a-415b-ac8f-8c7bd464e93e} - + {f8edd7fa-9a51-4e80-baeb-860825d2eac6} - + {811c0dab-7b96-4bd3-a154-b7572b58e4ab} - + {b57cf53f-2e49-4031-9822-047cc0e6bde2} - + {b7c2a162-dec9-4418-972e-240ab3cbfcae} - + {7e06e92c-537a-442b-9e4a-4761c84f8a1a} - + {df2638c0-8128-4847-867c-6eafe3dee7b5} - + {ddc3e27f-004d-4dd4-9dd3-931a013d2159} - + {632a8f38-d0f0-4d22-86b3-d69f5e6bf63a} - + {21b2c324-891f-48ea-ad1a-5ae13de12e28} - + {207bc7a9-ccf1-4f2f-a04d-45f72242ae25} From 5e4779aef2db71d71519e02ba4a6bb8e7758e5b6 Mon Sep 17 00:00:00 2001 From: James Chen Date: Tue, 28 Jan 2014 16:09:36 +0800 Subject: [PATCH 16/23] issue #3828: Updates TestJavascript.vcxproj. --- samples/test-javascript/proj.win32/TestJavascript.vcxproj | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/samples/test-javascript/proj.win32/TestJavascript.vcxproj b/samples/test-javascript/proj.win32/TestJavascript.vcxproj index 826bc21ee7..5319580d2a 100644 --- a/samples/test-javascript/proj.win32/TestJavascript.vcxproj +++ b/samples/test-javascript/proj.win32/TestJavascript.vcxproj @@ -98,8 +98,8 @@ if not exist "$(OutDir)" mkdir "$(OutDir)" -xcopy /Y /Q "$(ProjectDir)..\..\external\spidermonkey\prebuilt\win32\*.*" "$(OutDir)" -xcopy /Y /Q "$(ProjectDir)..\..\external\websockets\prebuilt\win32\*.*" "$(OutDir)" +xcopy /Y /Q "$(ProjectDir)..\..\..\external\spidermonkey\prebuilt\win32\*.*" "$(OutDir)" +xcopy /Y /Q "$(ProjectDir)..\..\..\external\websockets\prebuilt\win32\*.*" "$(OutDir)" @@ -154,8 +154,8 @@ xcopy "$(ProjectDir)..\tests" "$(OutDir)\TestJavascriptRes\" /e /Y if not exist "$(OutDir)" mkdir "$(OutDir)" -xcopy /Y /Q "$(ProjectDir)..\..\external\spidermonkey\prebuilt\win32\*.*" "$(OutDir)" -xcopy /Y /Q "$(ProjectDir)..\..\external\websockets\prebuilt\win32\*.*" "$(OutDir)" +xcopy /Y /Q "$(ProjectDir)..\..\..\external\spidermonkey\prebuilt\win32\*.*" "$(OutDir)" +xcopy /Y /Q "$(ProjectDir)..\..\..\external\websockets\prebuilt\win32\*.*" "$(OutDir)" From 6d491e66cf67eaa02f5a5f8df04e3bcc6286e2f0 Mon Sep 17 00:00:00 2001 From: James Chen Date: Tue, 28 Jan 2014 16:11:54 +0800 Subject: [PATCH 17/23] issue #3828: Updates travis-scripts/run-script.sh --- tools/travis-scripts/run-script.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/travis-scripts/run-script.sh b/tools/travis-scripts/run-script.sh index aa9c47f5c6..9a51112f2f 100755 --- a/tools/travis-scripts/run-script.sh +++ b/tools/travis-scripts/run-script.sh @@ -42,7 +42,7 @@ elif [ "$PLATFORM"x = "android"x ]; then # Create a directory for temporary objects mkdir android_build_objs - PROJECTS=("Cpp/HelloCpp" "Cpp/TestCpp" "Cpp/SimpleGame" "Cpp/AssetsManagerTest" "Javascript/TestJavascript" "Javascript/CocosDragonJS" "Javascript/CrystalCraze" "Javascript/MoonWarriors" "Javascript/WatermelonWithMe" "Lua/HelloLua" "Lua/TestLua") + PROJECTS=("test-cpp" "test-javascript" "test-Lua") for i in ${PROJECTS[*]}; do ln -s $COCOS2DX_ROOT/android_build_objs $COCOS2DX_ROOT/samples/$i/proj.android/obj done From 3f8f36df68ecd6d7b1d6fc8c95b3d39d51c2f5dd Mon Sep 17 00:00:00 2001 From: James Chen Date: Tue, 28 Jan 2014 16:23:16 +0800 Subject: [PATCH 18/23] issue #3828: Updates travis script. --- tools/travis-scripts/run-script.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/travis-scripts/run-script.sh b/tools/travis-scripts/run-script.sh index 9a51112f2f..c554780fec 100755 --- a/tools/travis-scripts/run-script.sh +++ b/tools/travis-scripts/run-script.sh @@ -42,7 +42,7 @@ elif [ "$PLATFORM"x = "android"x ]; then # Create a directory for temporary objects mkdir android_build_objs - PROJECTS=("test-cpp" "test-javascript" "test-Lua") + PROJECTS=("test-cpp" "test-javascript" "test-lua") for i in ${PROJECTS[*]}; do ln -s $COCOS2DX_ROOT/android_build_objs $COCOS2DX_ROOT/samples/$i/proj.android/obj done From 3cf052c3530b068fc3bb05a708b7a20ae2252be7 Mon Sep 17 00:00:00 2001 From: James Chen Date: Tue, 28 Jan 2014 16:31:59 +0800 Subject: [PATCH 19/23] Update AUTHORS [ci skip] --- AUTHORS | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS b/AUTHORS index 493859c5be..095386f830 100644 --- a/AUTHORS +++ b/AUTHORS @@ -95,6 +95,7 @@ Developers: Added Mingw-crt Support without breaking VS SDK CMake support for windows. Added support for x64 target of windows. + Added Dutch Language support. mchinen fix emulator issue for OpenGL ES 2.0 on Android From 41e261509b10a6192e22e3071f480af2f567b437 Mon Sep 17 00:00:00 2001 From: James Chen Date: Tue, 28 Jan 2014 16:33:01 +0800 Subject: [PATCH 20/23] Update CHANGELOG [ci skip] --- CHANGELOG | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index d8e824c6f1..37c0f6f519 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,7 @@ +cocos2d-x-3.0final ?.? ? +[All] + [NEW] Adds Dutch Language support. + cocos2d-x-3.0beta2 Jan.24 2014 [All] [NEW] Full screen support for desktop platforms. From c0746f40f94a136ec275c97f91a776884b987000 Mon Sep 17 00:00:00 2001 From: James Chen Date: Tue, 28 Jan 2014 17:13:02 +0800 Subject: [PATCH 21/23] issue #3828: Removes unused link folder. --- samples/test-cpp/proj.android/.project | 22 ------------------- samples/test-javascript/proj.android/.project | 20 ----------------- 2 files changed, 42 deletions(-) diff --git a/samples/test-cpp/proj.android/.project b/samples/test-cpp/proj.android/.project index dd5dee2a3b..3993dc62b8 100644 --- a/samples/test-cpp/proj.android/.project +++ b/samples/test-cpp/proj.android/.project @@ -40,26 +40,4 @@ org.eclipse.cdt.managedbuilder.core.managedBuildNature org.eclipse.cdt.managedbuilder.core.ScannerConfigNature - - - Classes - 2 - COCOS2DX/samples/Cpp/TestCpp/Classes - - - cocos2dx - 2 - COCOS2DX/cocos2dx - - - cocosdenshion - 2 - COCOS2DX/CocosDenshion - - - extensions - 2 - COCOS2DX/extensions - - diff --git a/samples/test-javascript/proj.android/.project b/samples/test-javascript/proj.android/.project index 48030971da..f7677dbac4 100644 --- a/samples/test-javascript/proj.android/.project +++ b/samples/test-javascript/proj.android/.project @@ -47,26 +47,6 @@ org.eclipse.wst.jsdt.core.jsNature - - Classes - 2 - COCOS2DX/samples/Javascript/TestJavascript/Classes - - - cocos2dx - 2 - COCOS2DX/cocos2dx - - - cocosdenshion - 2 - COCOS2DX/CocosDenshion - - - extensions - 2 - COCOS2DX/extensions - scripting 2 From c7bbd99b735acd85e5035ed391771ad6110b90b0 Mon Sep 17 00:00:00 2001 From: James Chen Date: Tue, 28 Jan 2014 17:16:01 +0800 Subject: [PATCH 22/23] issue #3828: Updates the path of java library reference. --- samples/test-cpp/proj.android/project.properties | 2 +- samples/test-javascript/proj.android/project.properties | 2 +- samples/test-lua/proj.android/project.properties | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/samples/test-cpp/proj.android/project.properties b/samples/test-cpp/proj.android/project.properties index 0a6dc6664d..16f145cfc9 100644 --- a/samples/test-cpp/proj.android/project.properties +++ b/samples/test-cpp/proj.android/project.properties @@ -10,4 +10,4 @@ # Project target. target=android-10 -android.library.reference.1=../../../../cocos/2d/platform/android/java +android.library.reference.1=../../../cocos/2d/platform/android/java diff --git a/samples/test-javascript/proj.android/project.properties b/samples/test-javascript/proj.android/project.properties index 0a6dc6664d..16f145cfc9 100644 --- a/samples/test-javascript/proj.android/project.properties +++ b/samples/test-javascript/proj.android/project.properties @@ -10,4 +10,4 @@ # Project target. target=android-10 -android.library.reference.1=../../../../cocos/2d/platform/android/java +android.library.reference.1=../../../cocos/2d/platform/android/java diff --git a/samples/test-lua/proj.android/project.properties b/samples/test-lua/proj.android/project.properties index 0a6dc6664d..16f145cfc9 100644 --- a/samples/test-lua/proj.android/project.properties +++ b/samples/test-lua/proj.android/project.properties @@ -10,4 +10,4 @@ # Project target. target=android-10 -android.library.reference.1=../../../../cocos/2d/platform/android/java +android.library.reference.1=../../../cocos/2d/platform/android/java From 1c0eb3198d2e199f6c567ae96e24792573dda618 Mon Sep 17 00:00:00 2001 From: James Chen Date: Tue, 28 Jan 2014 17:36:07 +0800 Subject: [PATCH 23/23] Update CHANGELOG [ci skip] --- CHANGELOG | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 37c0f6f519..5ff296a93c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,8 @@ cocos2d-x-3.0final ?.? ? [All] [NEW] Adds Dutch Language support. + + [FIX] Removes samples except testcpp|testjavascript|testlua. Moves sample games to `cocos2d/samples` repo. cocos2d-x-3.0beta2 Jan.24 2014 [All]