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

270 Commits

Author SHA1 Message Date
andyque 64098a1f84 update external library version number 2015-01-14 13:54:57 +08:00
andyque 9f0557b079 put box2d cmakelist to external 2015-01-13 17:10:21 +08:00
Huabing.Xu 06d583c5ea update deps to 31 2015-01-07 18:36:59 +08:00
andyque ddb6e678a6 update config.json 2014-12-31 11:58:54 +08:00
andyque e05d6d872b update v3-deps to 29 2014-12-11 10:04:16 +08:00
andyque 8a5c78b213 update external config to v3-deps-28.zip and update cocos2d-x version to rc2 2014-12-04 14:23:44 +08:00
pipu deda1a8f43 Modify external/config.json 2014-12-03 18:09:04 +08:00
pipu 9dee561d50 Modify external/config.json 2014-12-03 11:15:34 +08:00
andyque 09e41f5f19 change 3rd party dependency to 26 2014-11-28 14:25:48 +08:00
minggo 2936f79c4d [ci skip] update deps version 2014-11-27 20:56:15 +08:00
minggo 527b086774 [ci skip]update config.json 2014-11-27 12:44:27 +08:00
Ricardo Quesada 76f718a90d Use version 22 for external dependencies 2014-11-20 11:11:12 -08:00
Ricardo Quesada 8fd633926f externals: using v21 2014-11-14 15:31:48 -08:00
minggo 7796bdf234 [ci skip]update config.json 2014-10-21 17:48:44 +08:00
minggo 4930ed583a [ci skip]update config.json 2014-10-20 15:32:03 +08:00
minggo fed7787ceb [ci skip]update config.json 2014-10-20 09:36:01 +08:00
minggo be296265a4 [ci skip]update config.json 2014-10-20 09:29:26 +08:00
minggo 9c53b72962 [ci skip]update config.json 2014-10-17 10:21:45 +08:00
minggo 57068207ab [ci skip]update config.json 2014-10-16 15:35:42 +08:00
minggo 0a6bb3cdbc [ci skip]update config.json 2014-10-16 09:52:49 +08:00
minggo 9aa50acc07 [ci skip]update config.json 2014-10-14 18:23:18 +08:00
minggo 7f3a480fa7 remove duplicated codes 2014-10-14 18:01:41 +08:00
minggo 40ad15d25f [ci skip]update config.json 2014-10-14 17:08:58 +08:00
minggo abd2687cf5 Merge pull request #8683 from dualface/update_lua_template_runtime 
update lua-template
 2014-10-14 17:01:19 +08:00
dualface cee999ebbb update lua-template-default, lua-template-runtime, fix same proj problems. 2014-10-14 16:55:38 +08:00
minggo 92689dd1fa remove protocolbuf-lite 2014-10-14 14:53:24 +08:00
CocosRobot b8ee257cd2 [AUTO][ci skip]: updating cocos2dx_files.json 2014-10-14 06:27:27 +00:00
andyque 8a6b78c510 fix lua bindings 2014-10-14 11:24:45 +08:00
SunLightJuly 57f6f17f6d updated version in external/config.json 2014-10-10 17:07:59 +08:00
martell 30240a8a37 Multi platform cmake support 
Signed-off-by: martell <martellmalone@gmail.com>
 2014-10-03 23:21:45 +01:00
Dhilan007 a895790d3c update configuration for resource dependence 2014-09-29 18:17:05 +08:00
andyque 972c5f8ab2 adjust config 2014-09-24 12:03:17 +08:00
andyque a0d6bbbf9a add back config.json 2014-09-24 12:01:34 +08:00
andyque 7e9ede728f revert download.py and delete submodule 2014-09-24 10:26:56 +08:00
minggo a711ca1b3d update submodule 2014-09-23 17:14:52 +08:00
minggo f890ad0d00 add external submodule 2014-09-22 18:29:21 +08:00
minggo c4cd78cc96 remove external 2014-09-22 14:50:03 +08:00
andyque b280a02b5d modify external version 2014-09-09 15:23:07 +08:00
andyque 08c7f32627 add chipmunk static library for win32 2014-09-05 15:38:12 +08:00
andyque 3743f02c7e finish ios/mac/android 2014-09-05 11:39:11 +08:00
andyque 4f217ed577 remove include 2014-09-05 10:43:33 +08:00
andyque 4276c59975 remove chipmunk source code 2014-09-05 10:42:59 +08:00
Ricardo Quesada c149bfca00 Adds MARK: TODO: FIXME: in code 
Replaces XXX with FIXME:
Xcode 6 beta 4 supports this new format
 2014-08-29 12:54:24 -07:00
samuele3hu 3d5f8de346 Adjust android.mk for cocos2d and related module 2014-08-27 20:58:32 +08:00
samuele3hu 106cb2e110 Update external config.json 2014-08-27 11:07:41 +08:00
samuele3hu 3759648d3a Remove the useless aneroid.mk files 2014-08-27 10:21:47 +08:00
samuele3hu 74624f5ba1 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module 2014-08-25 11:52:52 +08:00
samuele3hu 893e0b0a08 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
 2014-08-25 11:45:29 +08:00
minggo e7050486d3 fix conflict 2014-08-24 18:56:51 +08:00
minggo 030f80a257 one static library for c++ and another one for lua-binding 2014-08-24 03:52:51 -07:00