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

542 Commits

Author SHA1 Message Date
samuele3hu ca562fb405 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewUI 2014-01-07 16:45:31 +08:00
samuele3hu 11a5945bd3 Fix:Resolve the android template projects’s errors 2014-01-07 16:45:03 +08:00
James Chen 1be11f8a82 Uses CMAKE_BINARY_DIR instead of CMAKE_SOURCE_DIR for template. 2014-01-06 23:55:57 -08:00
James Chen 2512c15cb9 Renames title names for cpp and lua templates. 2014-01-06 19:35:33 -08:00
James Chen 9183a69873 Simplifies linux template, build.sh is not needed now. 2014-01-06 19:34:48 -08:00
samuele3hu ac46932c06 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewUI 
Conflicts:
	tools/project-creator/module/cocos_files.json
 2014-01-06 20:07:39 +08:00
samuele3hu f36d4a9236 Fix:Resolve the lua android template errors 2014-01-06 19:59:31 +08:00
chuanweizhang 07e51e2c86 test template lua 2014-01-06 14:24:33 +08:00
chuanweizhang 6b5b49bb0b solve linux can't build 2013-12-31 15:08:21 +08:00
chuanweizhang 2579573b7e Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-12-31 14:58:37 +08:00
cw 89838e4c93 755 2013-12-30 18:45:20 +08:00
Dhilan007 4f2d7f47fc update describe for support translucency on android 2013-12-30 16:42:33 +08:00
Dhilan007 3fd9561df8 update describe for support translucency on android 2013-12-30 16:30:08 +08:00
Dhilan007 a5960c3252 recover java activity on android. 2013-12-30 15:58:04 +08:00
chuanweizhang 623e205256 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 
Conflicts:
	cocos/scripting/auto-generated
	samples/Cpp/TestCpp/Classes/Box2DTestBed/Box2dView.cpp
	samples/Cpp/TestCpp/Classes/Box2DTestBed/Box2dView.h
	samples/Cpp/TestCpp/Classes/ClippingNodeTest/ClippingNodeTest.cpp
	samples/Cpp/TestCpp/Classes/ClippingNodeTest/ClippingNodeTest.h
	samples/Cpp/TestCpp/Classes/LabelTest/LabelTestNew.cpp
	samples/Cpp/TestCpp/Classes/LabelTest/LabelTestNew.h
	tools/bindings-generator
	tools/tolua/cocos2dx_studio.ini

reset modify
 2013-12-30 14:51:51 +08:00
chengstory 26df681915 fixed #3457 remove jsoncpp. 2013-12-26 22:45:23 +08:00
chuanweizhang c9135eb6b9 modify linux template 2013-12-26 10:22:39 +08:00
chuanweizhang 23192a883c modify linux tempalte 2013-12-25 18:32:23 +08:00
chuanweizhang 6e871e8803 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 
Conflicts:
	template/multi-platform-js/Classes/AppDelegate.cpp
 2013-12-25 18:12:16 +08:00
chuanweizhang c53537e7c2 modify create_project 2013-12-25 15:53:47 +08:00
chuanweizhang 067d4fed0e modify template 2013-12-25 11:01:23 +08:00
chuanweizhang 2308e94c2f modify template 2013-12-24 09:42:37 +08:00
James Chen cafebe7295 Merge commit 'refs/pull/4572/head' of git://github.com/cocos2d/cocos2d-x into spine-test 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
 2013-12-23 20:28:51 +08:00
Dhilan007 d1972b3d17 support generate APK by script in template project and unify help message for usage. 2013-12-22 17:48:35 +08:00
byeonggee.seo f3e4d9277e spine android build phase moved 2013-12-20 19:16:16 +09:00
byeonggee.seo 0a30a9a604 spine simple JS binding supported 2013-12-20 16:10:15 +09:00
James Chen ca1e1275ee issue #2171: Updates CMakeLists.txt. 2013-12-17 15:51:32 +08:00
Dhilan007 39280d55f3 new label:add support for distanceField 
PerformanceTest:add performance test for label.
 2013-12-13 12:42:15 +08:00
Dhilan007 49a1d0ae62 Remove something association of CDT Builder,it make 'miss error' in builders. 2013-11-22 17:41:03 +08:00
samuele3 0dadddfb3d Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developTableView 2013-11-18 23:14:08 +08:00
samuele3 9bc3a10aa7 Hot fix:Repair js template copy resource error 2013-11-18 23:08:37 +08:00
minggo 2028cde015 fix compiling error of js template 2013-11-18 22:32:13 +08:00
minggo 425ce40a67 Merge pull request #4274 from Dhilan007/helloLuaConf 
[ci skip]fix Incomplete helloLua project configuration.
 2013-11-15 00:06:49 -08:00
Dhilan007 6db31508cc fix Incomplete helloLua project configuration. 2013-11-15 16:01:03 +08:00
minggo 5870a69bb7 Merge pull request #4269 from Dhilan007/di2854 
[ci skip]issue #2854:Disable CDT Builder on Eclipse
 2013-11-14 23:45:13 -08:00
Dhilan007 050a47c4eb issue #2854:Disable CDT Builder on Eclipse 2013-11-15 14:35:55 +08:00
samuele3 ec9bc0069f Modify template of lua ios_mac config and some bugs 2013-11-15 13:48:34 +08:00
minggo cd22f5543b Merge pull request #3997 from ondesly/screen_size_change 
[ci skip]android & ios screen size change support
 2013-11-10 23:10:13 -08:00
James Chen eeedab78b2 [LINUX] Adding template CMake files for linux. 2013-11-08 18:13:24 +08:00
minggo 04bb4033fd Merge pull request #4128 from Dhilan007/m_c_jsb 
[ci skip]rename jsb boot file.
 2013-11-07 18:48:30 -08:00
Dhilan007 006d32f883 rename jsb boot file. 2013-11-07 23:51:01 +08:00
minggo b5838b800d use python script to build template android projects 2013-11-04 16:48:17 +08:00
minggo f6d82d21d2 closed #3108: add -fsigned-char to make char to signed as default 2013-11-04 10:48:45 +08:00
James Chen 69b0206018 issue #2826: Updating vs project to link mozjs-25.lib 2013-10-31 11:24:43 +08:00
Michael Contento fe180078f0 Android: add xlargeScreens="true" to supports-screens 2013-10-28 23:12:51 +01:00
minggo e81efb24c9 issue #2905: android samples run ok 2013-10-23 16:49:50 +08:00
ondesly 969b464b9b android & ios screen size change support 2013-10-23 12:29:59 +04:00
Dhilan007 f11dba586a issue #2905:modification vs-project for folder structure change 2013-10-21 22:09:21 +08:00
James Chen ca3cbec858 [Template] Hello JavaScript --> HelloJavascript. It's for replacement. 2013-10-18 11:06:17 +08:00
minggo 4d28d0ab8b issue #2509:make lua android template build ok 2013-10-17 17:46:09 +08:00