Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/templates/cpp-template-default
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
..
Classes Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-23 14:46:14 +08:00
Resources Removes unused templates. 2014-03-04 09:46:32 +08:00
proj.android update templates for remove native activity 2014-03-25 15:43:42 +08:00
proj.ios_mac closed #4607: Fixed project created by template crashes on iOS5.1 device. 2014-04-15 11:56:50 +08:00
proj.linux Removes unused templates. 2014-03-04 09:46:32 +08:00
proj.win32 Removes unused templates. 2014-03-04 09:46:32 +08:00
proj.wp8-xaml added missing projects. Fixed property sheets 2014-04-19 10:09:53 -07:00
CMakeLists.txt issue #4729: Compilation error fixes for linux 2014-04-10 00:36:42 +08:00