Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/tests/cpp-tests/Resources
History
samuele3hu 064e159c70 Merge branch 'v3_testMerge' of https://github.com/pandamicro/cocos2d-x into v3_assetsmanager 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/platform/CCFileUtils.cpp
	tests/lua-tests/project/CMakeLists.txt
	tests/lua-tests/project/Classes/AppDelegate.cpp
	tests/lua-tests/project/proj.android/jni/Android.mk
	tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj
 		2014-10-15 13:41:27 +08:00
..
ActionTimeline 1. Modifying UIScale9Sprite 2014-10-10 10:44:16 +08:00
Images scale9Sprite without scale9enabled scale fix 2014-09-30 10:59:20 +04:00
Manifests no message 2014-10-09 18:30:39 +08:00
Misc Re-adds resources in cpp-tests and lua-tests, but removes some large 2014-05-05 13:27:47 +08:00
Particles plist are not executable files 2014-05-09 20:11:36 -07:00
Shaders fix outline bug 2014-06-30 17:21:04 +08:00
Shaders3D fix skinned outline effect 2014-08-14 10:44:03 +08:00
Sprite3DTest remove unused resource 2014-09-26 15:57:18 +08:00
TileMaps add tile map staggered test 2014-10-11 15:09:58 +08:00
animations Re-adds resources in cpp-tests and lua-tests, but removes some large 2014-05-05 13:27:47 +08:00
audio Add audio resource. 2014-09-23 15:38:40 +08:00
ccb Re-adds resources in cpp-tests and lua-tests, but removes some large 2014-05-05 13:27:47 +08:00
ccs-res@72970e1622 Modifying cocos2d_lib.xcodeproj, cocos/Android.mk, cocos/editor-support/cocostudio/Android.mk 2014-10-12 15:39:22 +08:00
components Re-adds resources in cpp-tests and lua-tests, but removes some large 2014-05-05 13:27:47 +08:00
configs config max support light number in shader 2014-09-25 15:29:32 +08:00
extensions Re-adds resources in cpp-tests and lua-tests, but removes some large 2014-05-05 13:27:47 +08:00
fonts Mac fonts tests 2014-07-24 12:27:17 +04:00
hd scale9Sprite without scale9enabled scale fix 2014-09-30 10:59:20 +04:00
spine Re-adds resources in cpp-tests and lua-tests, but removes some large 2014-05-05 13:27:47 +08:00
zwoptex Re-adds resources in cpp-tests and lua-tests, but removes some large 2014-05-05 13:27:47 +08:00
.gitignore Re-adds resources in cpp-tests and lua-tests, but removes some large 2014-05-05 13:27:47 +08:00
CocosBuilderExample.ccbproj Re-adds resources in cpp-tests and lua-tests, but removes some large 2014-05-05 13:27:47 +08:00
CocosBuilderExample.ccbresourcelog Mac fonts tests 2014-07-24 12:27:17 +04:00
Hello.png Re-adds resources in cpp-tests and lua-tests, but removes some large 2014-05-05 13:27:47 +08:00
Test.html finish WebView Tests 2014-08-26 22:03:55 +08:00
background.caf Re-adds resources in cpp-tests and lua-tests, but removes some large 2014-05-05 13:27:47 +08:00
background.mp3 Re-adds resources in cpp-tests and lua-tests, but removes some large 2014-05-05 13:27:47 +08:00
background.ogg Re-adds resources in cpp-tests and lua-tests, but removes some large 2014-05-05 13:27:47 +08:00
background.wav Re-adds resources in cpp-tests and lua-tests, but removes some large 2014-05-05 13:27:47 +08:00
cocosvideo.mp4 issue #4876:Add test case to play video 2014-05-08 18:14:32 +08:00
effect1.raw Re-adds resources in cpp-tests and lua-tests, but removes some large 2014-05-05 13:27:47 +08:00
effect1.wav Re-adds resources in cpp-tests and lua-tests, but removes some large 2014-05-05 13:27:47 +08:00
effect2.ogg Re-adds resources in cpp-tests and lua-tests, but removes some large 2014-05-05 13:27:47 +08:00
fileLookup.plist Re-adds resources in cpp-tests and lua-tests, but removes some large 2014-05-05 13:27:47 +08:00
fps_images.png Adds missing 'fps_images.png', our test case needs them 2014-05-08 15:09:02 +08:00
music.mid Re-adds resources in cpp-tests and lua-tests, but removes some large 2014-05-05 13:27:47 +08:00
pew-pew-lei.wav Re-adds resources in cpp-tests and lua-tests, but removes some large 2014-05-05 13:27:47 +08:00