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

241 Commits

Author SHA1 Message Date
zhangbin da24454c6c Update the reference of submodule cocos2d-console. 2015-09-14 11:46:02 +08:00
zhangbin d145416e1f Update the reference of submodule cocos2d-console. 2015-09-07 17:36:54 +08:00
zhangbin 3f6816f2f7 Update the reference of submodule cocos2d-console. 2015-08-17 17:16:21 +08:00
zhangbin deaf50e803 Update the reference of submodule cocos2d-console. 2015-08-17 15:41:56 +08:00
zhangbin 6628dc47cb Update the reference of submodule cocos2d-console. 2015-08-14 15:12:58 +08:00
zhangbin f91908d651 Add copy resources config of js-tests for web platform. 2015-08-10 12:00:53 +08:00
zhangbin cf3f5ab26c Update the reference of submodule cocos2d-console. 2015-08-07 15:56:52 +08:00
zhangbin 91b2191988 Move the framework-compile tools into cocos2d-console. 2015-08-05 17:54:32 +08:00
zhangbin d11605aa37 Update the reference of submodule cocos2d-console. 2015-08-04 14:35:56 +08:00
Bin Zhang a5e3267c98 Update the reference of submodule cocos2d-console. 2015-07-17 10:08:35 +08:00
Bin Zhang 569695d844 Update the reference of submodule cocos2d-console. 2015-07-14 09:40:42 +08:00
Bin Zhang 75920b8e11 Update the reference of submodule cocos2d-console. 2015-07-13 12:05:17 +08:00
Bin Zhang e21634f618 Update the reference of submodule cocos2d-console. 2015-06-29 15:18:00 +08:00
pandamicro 1fd45d6f30 Update submodules 2015-06-26 13:45:28 +08:00
Bin Zhang c9c212d0e1 Solve the error when run tests projects with `cocos run`. 2015-06-24 15:33:13 +08:00
Bin Zhang 38ad8ca938 Update the reference of submodule cocos2d-console. 2015-06-18 15:38:17 +08:00
Bin Zhang 2827e9fa6a Update the reference of submodule cocos2d-console. 2015-06-12 18:32:23 +08:00
Bin Zhang 825c89299a Update the reference of submodule cocos2d-console. 2015-06-04 15:30:45 +08:00
Bin Zhang 74496b4c7d Update the reference of submodule cocos2d-console. 2015-05-28 15:51:59 +08:00
Bin Zhang 3fcc5ccc48 Update the reference of submodule cocos2d-console. 2015-05-28 11:41:28 +08:00
Bin Zhang 3298145eb5 Support build & run Android Studio project in console. 2015-05-25 16:53:36 +08:00
Bin Zhang c4349d9441 Update the reference of submodule cocos2d-console. 2015-05-20 10:54:40 +08:00
Bin Zhang 815120d95c Update the reference of submodule cocos2d-console. 2015-05-15 16:06:11 +08:00
Bin Zhang 65ef7cea88 Update the reference of submodule cocos2d-console. 2015-05-14 18:00:47 +08:00
zhangbin e901918115 Update the reference of submodule cocos2d-console. 2015-05-13 14:07:10 +08:00
zhangbin fc9e5609c8 Rename the target name of Xcode project in templates. 2015-04-30 15:20:47 +08:00
zhangbin dd022dd7b2 Update the reference of submodule cocos2d-console. 2015-04-21 17:28:53 +08:00
zhangbin fca642e88e Update the reference of submodule cocos2d-console. 2015-04-21 16:55:46 +08:00
samuele3hu 092eed12a2 Update cocos2d-console submodule 2015-04-14 16:43:03 +08:00
zhangbin 4929b584e2 Update the reference of submodule cocos2d-console. 2015-04-09 13:39:01 +08:00
SunLightJuly 5847325e2d updated submodule 2015-04-08 11:37:33 +08:00
zhangbin 7aaf122a41 Support compile & run test projects with cocos2d-console on wp8. 2015-03-25 11:42:55 +08:00
zhangbin e457cb47d7 Update the reference of submodule cocos2d-console. 2015-03-23 16:09:43 +08:00
zhangbin 5e86152b15 Update the reference of submodule cocos2d-console. 2015-03-23 12:04:14 +08:00
zhangbin eb95bbce02 Update the reference of submodule cocos2d-console. 2015-03-23 10:10:35 +08:00
zhangbin 1b92859c61 Update the reference of submodule cocos2d-console. 2015-03-16 16:29:07 +08:00
Nite Luo 99bc7e2a2b Fix multithread compiling 2015-03-13 19:53:22 -07:00
zhangbin 8c57edbad5 Update the reference of submodule cocos2d-console. 2015-03-06 14:51:29 +08:00
zhangbin 6ada496b57 Update the reference of submodule cocos2d-console. 2015-02-25 18:03:05 +08:00
SunLightJuly 2b269aab53 update sub-module "cocos2d-console" 2015-02-25 10:45:36 +08:00
minggo 49489ba3ad update console 2015-01-30 20:06:43 +08:00
minggo f4266c9ae3 update console submodule 2015-01-30 14:58:20 +08:00
zhangbin 9766e9f748 Update the reference of submodule cocos2d-console. 2015-01-13 11:16:54 +08:00
zhangbin 489dc2da16 Update the reference of submodule cocos2d-console. 2015-01-12 10:27:14 +08:00
zhangbin d80830c264 Update the reference of submodule cocos2d-console. 2015-01-07 17:48:10 +08:00
zhangbin 1837b083f7 Update the reference of submodule cocos2d-console. 2015-01-06 18:13:48 +08:00
zhangbin 6adedee781 Update the reference of submodule cocos2d-console. 2014-12-31 14:55:14 +08:00
zhangbin 98e24b1cdc Update the reference of submodule cocos2d-console. 2014-12-30 16:28:23 +08:00
zhangbin f7a6472748 Update the reference of submodule cocos2d-console. 2014-12-16 17:19:06 +08:00
zhangbin 72f88a9790 Update the reference of submodule cocos2d-console. 2014-12-08 16:43:44 +08:00
zhangbin 79a7ca6516 Update the reference of submodule cocos2d-console. 2014-12-03 16:40:42 +08:00
zhangbin 16df08679c Update the reference of submodule cocos2d-console. 2014-12-03 11:54:59 +08:00
Dhilan007 6603d7183a Update the reference of submodule cocos2d-console 2014-11-28 13:41:52 +08:00
Ricardo Quesada 2362ea372c new console version 2014-11-27 11:34:43 -08:00
Ricardo Quesada ab8838f0c0 New cocos2d-console version 2014-11-27 10:48:19 -08:00
zhangbin fade3dc61f Update the reference of submodule cocos2d-console. 2014-11-27 20:37:18 +08:00
Ricardo Quesada 59461439ad Updates console 2014-11-20 17:55:59 -08:00
Ricardo Quesada 04510c39fa Uses new version of cocos2d-console 2014-11-19 12:25:50 -08:00
zhangbin 5aff5640b5 Solve the error when building android for sample projects of engine. 
1. Update the project config.
2. Update the submodule cocos2d-console.
 2014-11-18 18:39:53 +08:00
zhangbin 534570075b Update the reference of submodule cocos2d-console. 2014-11-17 15:57:49 +08:00
zhangbin 131c60fd20 Update the reference of submodule cocos2d-console. 2014-10-14 16:29:49 +08:00
zhangbin 72ebd715b3 Update the reference of submodule cocos2d-console. 2014-10-10 16:28:03 +08:00
zhangbin bce62aef82 Update the reference of submodule cocos2d-console. 2014-10-08 15:53:01 +08:00
zhangbin 3b007e0845 Update the reference of submodule cocos2d-console. 2014-09-19 17:03:34 +08:00
zhangbin f73d015343 Update the reference of submodule cocos2d-console. 2014-09-17 18:03:49 +08:00
zhangbin c20caa7c35 Update the reference of submodule cocos2d-console. 2014-09-10 13:59:48 +08:00
zhangbin 3e1053aa2a Update the reference of submodule cocos2d-console. 2014-09-02 09:31:23 +08:00
zhangbin 97a4258cd6 Update the reference of submodule cocos2d-console. 2014-08-21 14:10:36 +08:00
zhangbin 8034b5429e Update the reference of submodule cocos2d-console. 2014-08-20 13:45:01 +08:00
zhangbin 8f30a7eeff Update the reference of submodule cocos2d-console. 2014-08-20 11:41:58 +08:00
zhangbin dab6e5fb70 Update the reference of submodule cocos2d-console. 2014-08-19 15:21:43 +08:00
zhangbin 77c7ed9896 Update the reference of submodule cocos2d-console. 2014-08-14 15:13:43 +08:00
zhangbin c8ad850d68 Update the reference of submodule cocos2d-console. 2014-08-13 10:06:22 +08:00
yangxiao1 61eaa082a2 fix windows 2014-08-08 15:33:30 +08:00
zhangbin 1ced935ea2 Update the reference of submodule cocos2d-console. 2014-08-06 17:44:00 +08:00
samuele3hu 27b98ee237 Update cocos2d-console submodule 2014-07-31 17:31:59 +08:00
zhangbin 6c8cd00a53 Update the reference of submodule cocos2d-console. 2014-07-21 17:04:40 +08:00
zhangbin 1a37040e8d Update the reference of submodule cocos2d-console. 2014-07-17 17:21:31 +08:00
zhangbin 94ea6c40d6 Update the reference of submodule cocos2d-console. 2014-07-15 17:39:56 +08:00
zhangbin 28dd766159 Update the reference of submodule cocos2d-console. 2014-07-15 14:36:57 +08:00
zhangbin 30ebba8d51 Update the reference of submodule cocos2d-console. 2014-07-14 13:51:44 +08:00
zhangbin 68bd1c3c76 Update the reference of submodule cocos2d-console. 2014-07-10 09:29:57 +08:00
zhangbin af5cf0a33f Add configuration in templates to set the bundle identity of Mac & iOS project. 2014-07-08 10:22:08 +08:00
zhangbin ac4a8b1960 Update the reference of submodule cocos2d-console. 2014-07-07 10:11:46 +08:00
zhangbin b8e7fd425d Update the reference of submodule cocos2d-console. 2014-06-30 17:28:46 +08:00
zhangbin bd6aed8a7b Update the reference of submodule cocos2d-console. 2014-06-19 14:47:16 +08:00
zhangbin 60c08dcb47 Update the reference of submodule cocos2d-console. 2014-06-13 14:15:17 +08:00
zhangbin 07aaa6fabe Update the reference of submodule cocos2d-console. 2014-06-09 11:27:01 +08:00
samuele3hu 52323b27fa Update cocos2d-console submodule 2014-06-06 12:09:10 +08:00
samuele3hu 5b3f3da428 update console submodule 2014-06-03 10:13:23 +08:00
samuele3hu b91d8255bd Add xxtea encrypt support for lua and update the console submodule 2014-06-03 09:55:57 +08:00
zhangbin d3d8c94c32 Update the reference of submodule cocos2d-console. 2014-05-21 17:48:46 +08:00
zhangbin ccc85ab210 Update the reference of submodule cocos2d-console. 2014-05-20 15:03:43 +08:00
zhangbin 2b3f236792 Support generate release apk with prebuilt libs. 2014-05-20 10:47:27 +08:00
zhangbin 2eafb3c39f Update the reference of submodule cocos2d-console. 2014-05-15 10:37:06 +08:00
Huabing.Xu b80a1e7c3c roll back submodule changes 2014-05-09 21:31:15 -07:00
yangxiao 879958855b UniformValue use union array 2014-05-09 14:38:36 -07:00
zhangbin 7d270cd1a1 Update the reference of submodule cocos2d-console. 2014-05-09 11:48:43 +08:00
zhangbin 64f30980b4 closed #4990, Fix the error in cocos2d-console when rename files on windows. 2014-04-30 11:25:47 +08:00
zhangbin 9ad5acec7c Update the reference of submodule cocos2d-console. 2014-04-29 11:56:50 +08:00
zhangbin 0eaf8cc38d Support fuzzy matching in the create project configuration. 2014-04-28 14:16:19 +08:00
zhangbin b7ff312c7c Update the reference of submodule cocos2d-console. 2014-04-22 11:21:13 +08:00
zhangbin 00910216b1 Update the reference of submodule cocos2d-console. 2014-04-21 11:01:39 +08:00
zhangbin 33472c7805 closed #4863, Zipalign the apk generated with release mode. 2014-04-17 17:18:39 +08:00
zhangbin 4af7e14dc8 Update the reference of submodule cocos2d-console. 2014-04-16 10:32:43 +08:00
zhangbin dd5c2aacd6 Merge branch 'develop' into issue4727 
Conflicts:
	tools/cocos2d-console
 2014-04-15 15:18:00 +08:00
minggo 0ecd8e271e update console submodule 2014-04-14 21:02:01 +08:00
zhangbin 7874cd8045 closed #4786, Show tip message when python is not compatible. 2014-04-14 17:29:37 +08:00
zhangbin 29615f7e26 closed #4727, Support run sample projects with console. 2014-04-11 11:36:23 +08:00
zhangbin cd6ff8f391 Update the reference of submodule cocos2d-console. 2014-04-10 09:51:46 +08:00
zhangbin 12fb27b01e closed #4666, Update the build configuration files in template & update the reference of submodule cocos2d-console. 2014-04-08 16:23:12 +08:00
zhangbin 269c63ec69 Update the reference of submodule "cocos2d-console". 2014-03-27 09:50:16 +08:00
zhangbin beb6f7359c Update the reference of submodule "cocos2d-console". 2014-03-25 14:19:46 +08:00
zhangbin 64f90e5f04 Update the reference of submodule "cocos2d-console". 2014-03-20 14:12:58 +08:00
zhangbin bf68f180b4 Update the reference of submodule "cocos2d-console". 2014-03-17 15:25:07 +08:00
lihex da7b6d565c update submodule 2014-03-15 12:20:22 +08:00
lihex c0416fe554 update submodule 2014-03-15 00:37:00 +08:00
lihex c36bae6c07 update submodule 2014-03-14 23:48:20 +08:00
lihex f7a1d1f095 update submodule 2014-03-14 22:56:40 +08:00
lihex 99221ffcf1 update submodule 2014-03-14 22:17:47 +08:00
lihex b62d2e8ec0 update submodule 2014-03-14 21:29:36 +08:00
lihex 2ea565018c update submodule 2014-03-14 19:41:51 +08:00
lihex 28a71ff14e update submodule 2014-03-13 22:11:38 +08:00
lihex 3ce647268d update submodule 2014-03-13 19:35:55 +08:00
zhangbin be51779c4e Update the reference of submodule "cocos2d-console". 2014-03-12 20:35:05 +08:00
lihex 00a364e66f Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 
Conflicts:
	templates/lua-template-default/frameworks/runtime-src/proj.android/build-cfg.json
 2014-03-12 14:13:20 +08:00
lihex 1e8990744e update submodule 2014-03-11 22:02:47 +08:00
lihex 1c533a7746 update console submodule 2014-03-11 17:43:35 +08:00
minggo 9d1a70d569 update console to latest version 2014-03-11 16:47:16 +08:00
minggo 376ae24c10 update console to latest codes 2014-03-10 20:01:22 +08:00
lihex d96c7b4424 update submodule 2014-03-07 14:14:13 +08:00
lihex c206384edd rename template config file 2014-03-06 13:56:18 +08:00
lihex 389811d9e5 update submodule 2014-03-05 16:14:56 +08:00
minggo e044cbb12b update console to latest version 2014-03-04 16:47:56 +08:00
minggo 224b3220eb update console to latest version 2014-03-04 16:45:02 +08:00
minggo db8ff41dbb update cocos2d-console to latest code 2014-02-20 15:50:57 +08:00
James Chen a75004398d issue #3900: Updates cocos2d-console to support spidermonkey v27. 2014-02-08 13:48:38 +08:00
James Chen 0298c338a6 issue #2826: Updating cocos2d-console submodule. 2013-11-01 10:46:06 +08:00
James Chen 59f5353f89 issue #2483: Updating cocos2d-console. 2013-08-07 18:06:31 +08:00
James Chen 5ce150a10c issue #2340: Updating submodule of cocos2d-console. 2013-06-27 17:19:22 +08:00
James Chen c7fd3a3483 Adding submodule of cocos2d-console to 'tools' folder. 2013-06-02 10:53:46 +08:00