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/Classes/ShaderTest
History
Huabing.Xu feec24e3ef Merge branch 'v3' into develop_migrate_math_lib_merge 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/2d/CCNode.cpp
	cocos/2d/CCRenderTexture.cpp
	cocos/2d/platform/wp8/CCGLView.h
	cocos/physics/CCPhysicsBody.cpp
	extensions/physics-nodes/CCPhysicsSprite.cpp
	extensions/physics-nodes/CCPhysicsSprite.h
	tests/cpp-tests/Classes/PhysicsTest/PhysicsTest.cpp
 		2014-04-25 16:20:24 +08:00
..
ShaderTest.cpp replace Point with Vector2 in tests, extension folder 2014-04-15 18:23:40 +08:00
ShaderTest.h migrate setPosition to Vector2 2014-04-15 16:16:14 +08:00
ShaderTest2.cpp Merge branch 'v3' into develop_migrate_math_lib_merge 2014-04-25 16:20:24 +08:00
ShaderTest2.h issue #4783, add outline shader files 2014-04-14 11:52:17 +08:00