Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos
History
Huabing.Xu adcacbf5eb Merge branch 'develop' into develop_migrate_math_lib_merge 
Conflicts:
	cocos/2d/CCLabelAtlas.cpp
	cocos/2d/CCLabelAtlas.h
	cocos/2d/CCLabelBMFont.cpp
	cocos/2d/CCLabelBMFont.h
	cocos/editor-support/cocostudio/CCSGUIReader.cpp
 		2014-04-24 16:58:46 +08:00
..
2d Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-24 16:58:46 +08:00
audio Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-21 17:47:34 +08:00
base Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-19 00:30:34 +08:00
deprecated IOS/Mac OK: remove kazMath 2014-04-21 17:37:52 +08:00
editor-support Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-24 16:58:46 +08:00
math IOS/Mac OK: remove kazMath 2014-04-21 17:37:52 +08:00
network = [FIX]: HTTPClient should not report 2xx status codes as errors! 2014-04-09 11:07:51 +04:00
physics replace Point with Vector2 in cocos folder cpp file 2014-04-15 18:13:57 +08:00
scripting/lua-bindings Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-21 17:47:34 +08:00
storage added wp8 support files and projects 2014-03-28 15:39:20 -07:00
ui fix warning in compiling 2014-04-21 09:52:59 +08:00