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

10 Commits

Author SHA1 Message Date
2youyou2 4eaaaddc34 upload resource 2013-10-31 17:29:03 +08:00
minggo bcb171e3c9 fix line end in windows 2013-09-20 22:23:13 +08:00
zhangcheng a25c2cabf8 1. Fixes failed to build windows. 
2. Upload CocoGUI Resources.
 2013-09-17 13:25:15 +08:00
James Chen 208f705845 Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into 2youyouo2-develop 
Conflicts:
	cocos2d_libs.xcodeproj/project.pbxproj
	samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp
	samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.h
 2013-09-16 18:18:23 +08:00
2youyou2 2213e8118d fix armature hd crash 2013-09-14 23:31:33 +08:00
zhangcheng 95236e86d9 1. update scenetest version. 2013-09-14 20:49:02 +08:00
zhangcheng 0121943c11 1. Adds SceneEditorTest hd version 2013-09-14 16:34:26 +08:00
yinkaile d29931dc4f 1.add hd resource 
2.remove zobie resource
3.support frame event
 2013-06-08 22:08:22 +08:00
James Chen 2d1172814d issue #2075: Adding spine editor support. Adding a new test 'SpineTest' in TestCpp, adding the parse code in "extensions/spine". It works only on iOS now. 2013-04-24 13:57:34 +08:00
James Chen 4660e72eda issue #1603: Moved the position of some projects. 2012-12-20 12:58:21 +08:00