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
andyque 5624da5448 Merge branch 'v3' into cleanupBinaryLoader 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/editor-support/cocostudio/CCSGUIReader.h
	cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj.filters
 		2014-06-23 09:37:39 +08:00
..
ActionTimeline add frame event test 2014-06-18 11:22:38 +08:00
Images Roll back test_image_ar.pvr 2014-05-23 17:19: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 remove the comments 2014-06-12 10:19:08 +08:00
Shaders3D Squashed commit of the following: 2014-05-18 14:49:16 -07:00
Sprite3DTest use a small texture for sprite3D 2014-06-17 22:31:56 +08:00
TileMaps Re-adds resources in cpp-tests and lua-tests, but removes some large 2014-05-05 13:27:47 +08:00
animations Re-adds resources in cpp-tests and lua-tests, but removes some large 2014-05-05 13:27:47 +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@2173b0b479 update ccs-res 2014-06-18 11:26:26 +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 change default auto-run config to false 2014-05-13 14:17:43 +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 update test cast of label. 2014-06-09 13:41:32 +08:00
hd remove resource to use armature resource 2014-06-13 14:41:28 +08: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 Re-adds resources in cpp-tests and lua-tests, but removes some large 2014-05-05 13:27:47 +08:00
Hello.png Re-adds resources in cpp-tests and lua-tests, but removes some large 2014-05-05 13:27:47 +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