Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
19,324 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

5 Commits

Author SHA1 Message Date
Huabing.Xu f65973d9f0 Merge branch 'develop' into develop_migrate_math_lib_merge 
Conflicts:
	cocos/2d/CCActionInterval.cpp
	cocos/2d/CCLabelAtlas.cpp
	cocos/2d/CCLabelBMFont.cpp
	tests/cpp-tests/Classes/ClippingNodeTest/ClippingNodeTest.cpp
 2014-04-23 14:46:14 +08:00
袁全伟 56f9def298 Update AppDelegate.cpp 
use getInstance replace :)
 2014-04-22 13:20:07 +08:00
Huabing.Xu 7f61639541 replace Point with Vector2 in tests, extension folder 2014-04-15 18:23:40 +08:00
Dale Stammen 210f95c2d3 can't close app on WP8 2014-03-28 11:27:43 -07:00
James Chen 33a5be526c Removes unused templates. 2014-03-04 09:46:32 +08:00