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

243 Commits

Author SHA1 Message Date
minggo 28928263c0 update console (#17772) 2017-05-03 13:41:45 +08:00
Bin Zhang 3ec14488fc Update submodule cocos2d-console. (#17523) 
Changed: Disable the command `cocos gen-templates`.
 2017-03-16 14:04:56 +08:00
Bin Zhang 010a724149 Solve the error when building Android Studio project. (#17504) 2017-03-15 15:45:50 +08:00
Bin Zhang ce40f13a74 Update the reference of submodule cocos2d-console. (#17501) 
Changed:
1. Support VS2017 in cocos compile.
2. Solve the error that when building android project with Android SDK Tools 25.3.x.
 2017-03-15 11:06:43 +08:00
Bin Zhang 769f7830f0 Improve the AndroidStudio configurations of tests & templates (#17495) 
* Improve the AndroidStudio configuration of test projects to fit the new implementation of cocos compile.

* Improve the AndroidStudio configuration of templates to fit the new implementation of cocos compile.
 2017-03-14 13:41:28 +08:00
Bin Zhang c69d14c32e Update the reference of submodule cocos2d-console. (#17432) 
Solve the error when using cocos command on Windows.
 2017-03-02 18:07:05 +08:00
Bin Zhang 740e761d88 Update the reference of submodule cocos2d-console. (#17425) 
Changed: Improve the logic of gen-libs with external libraries tremolo & pvmp3dec.
 2017-03-01 13:41:01 +08:00
Bin Zhang a8dd7aff4f Update the reference of submodule cocos2d-console. (#17407) 
Changed: Add argument "--agreement" for skip the shown of agreement.
 2017-02-24 17:28:47 +08:00
Bin Zhang 1ef380f3a9 Update the submodule cocos2d-console. (#17337) 
Changed: Solve the error when compile project for tizen with option `--tizen-strip`.
 2017-02-10 10:44:05 +08:00
Bin Zhang 1496b9e8be Update the reference of submodule cocos2d-console. (#17212) 2017-01-19 09:42:26 +08:00
minggo 0cb1e29323 update cocos console to fix compiling error with Android Studio projects (#17129) 2017-01-09 14:44:52 +08:00
Bin Zhang 3656c999da Update the reference of submodule cocos2d-console. (#17074) 
Changes: Keep the ndk module paths without relative path.
 2016-12-27 18:30:05 +08:00
James Chen 73542b2f17 Updates cocos2d-console (#16951) 2016-12-02 14:47:29 +08:00
minggo 403d679333 update sunbmodule to fix lua in arm64 bit in debug mode 2016-11-29 15:30:50 +08:00
Bin Zhang 3e59a082f5 Update submodule cocos2d-console. (#16851) 
* Update submodule cocos2d-console.
Changes: Add option '--ap' for command gen-libs.

* Update submodule cocos2d-console.
Changes: Support strip arm64-v8a libs when generating android libs.
 2016-11-17 18:06:32 +08:00
Bin Zhang 3b87e46280 Support compile & run project on Tizen by cocos command. (#16783) 
* Add config files for build engine source code on tizen.

* Add config files for cpp-empty-test on tizen.

* Add missing files.

* Add config files for cpp-tests on tizen.

* Add Tizen config files for lua-bindings.

* Add Tizen config files for lua-empty-test.

* Solve the error when build lua-empty-test for Tizen.

* Add Tizen config files for lua-tests.

* Solve the error when build lua-tests for Tizen.

* Add tizen config files for templates.

* Update submodule cocos2d-console.
 2016-11-02 17:41:26 +08:00
Bin Zhang de9a3e52a5 Update the submodule cocos2d-console. (#16753) 
Changed : Improve `cocos run -p iOS`  for support XCode 8.
 2016-10-28 09:35:30 +08:00
Bin Zhang 93609ff586 Update submodule cocos2d-console. (#16683) 
Solve the error prebuilt Android.mk generated by cocos gen-libs.
 2016-10-12 16:53:11 +08:00
minggo a6f3773aef Luajit (#16620) 
* update console

* load lua according architecture

* install android-13 in travis
 2016-09-28 16:19:20 +08:00
minggo 20a0798007 avoid to use __system_get_property__ (#16433) 
* avoid to use __system_get_property__

* add utils

* revert console
 2016-08-24 17:11:41 +08:00
minggo 1748dfa79d update agreement (#16431) 2016-08-24 14:52:55 +08:00
yanli.huang 5db61ca26f fix cocos package can't update (#16428) 
* update cocos2d-console commit id : cocos package so change pyc

* update cocos2d-console  commit id: fix cocos package can't update
 2016-08-24 10:09:42 +08:00
yanli.huang b0c8a8505a update cocos2d-console commit id : cocos package so change pyc (#16413) 2016-08-22 16:06:29 +08:00
yanli.huang 4a2d384a6c update cocos2d-console commit：fault-tolerant for cocos package (#16273) 
* update cocos2d-console commit

* update cocos2d-console commit:
fix: Interrupt to compile when cocos package prompted user to update

* update cocos2d console commit  :fault-tolerant for cocos package
1.add mode param when call cocos package encrypt
2.fault-tolerant. call encrypt if and only if used cocos package to import plugin
 2016-07-31 22:30:44 +08:00
minggo 295f0716dc use gcc 4.9 instead 2016-07-28 10:56:52 +08:00
yanli.huang 3e33b7a1ca update cocos2d-console commit (#16222) 
* update cocos2d-console commit

* update cocos2d-console commit:
fix: Interrupt to compile when cocos package prompted user to update
 2016-07-27 15:37:12 +08:00
zhangbin 361a94e920 Update the submodule cocos2d-console. 
Solve the crash problem of cocos console on some Mac machines. Related issue: #16138
 2016-07-25 11:38:03 +08:00
yanli.huang 5b3eae7be8 update cocos2d-console commit (#16196) 2016-07-25 11:19:11 +08:00
zhangbin f4accbdf3e Solve the error in command gen-templates & gen-simulator. 2016-07-13 09:42:05 +08:00
zhangbin 51e7de9457 Update submodule cocos2d-console. 
Changed:
- Remove unused command framework.
 2016-07-01 12:03:26 +08:00
Ricardo Quesada 7d7936bbc1 fix issue #15958 
again
 2016-06-28 18:07:30 -07:00
Ricardo Quesada 5a8eb243e6 fix: cocos new does not crash 
Github issue #15958
 2016-06-27 18:33:38 -07:00
Ricardo Quesada 71572d9015 updates cocos console 
fix github issue #15890 and partially fixes github issue #15889
 2016-06-24 18:31:32 -07:00
minggo 88bb8a4974 cocos command use clang 2016-06-02 14:34:10 +08:00
zhangbin 08706012e8 Update the reference of submodule cocos2d-console. 
1. Change the Tracker ID of GA in console.
2. Disable the BI Data Statistic.
3. Add special prefix '2dx-' for the Data uploaded by console in -x engine.
 2016-05-26 10:42:56 +08:00
zhangbin c68ecaffab Update the reference of submodule cocos2d-console. 
Solve the english grammar error.
 2016-05-19 12:04:56 +08:00
zhangbin 2f5b53ad59 Update the reference of submodule cocos2d-console. 
Solve the error when running cocos command if ~/.cocos is not existed.
 2016-05-19 11:30:28 +08:00
zhangbin 2d00073653 Update the reference of submodule cocos2d-console. 2016-05-17 17:25:31 +08:00
minggo ba78999ffd update cocos2d-console 2016-04-21 09:39:19 +08:00
zhangbin bb4e9869d1 Update the submodule cocos2d-console 2016-03-30 15:14:05 +08:00
zhangbin e3de0d1f0b Update the submodule cocos2d-console 2016-03-29 15:38:00 +08:00
zhangbin 077b5e7bfc Update the reference of submodule cocos2d-console 2016-02-15 10:49:57 +08:00
lunhao.guo b32d013dc4 update cocos2d-console submodule to SH1 1ad9331a9e3cbef9c499b6c785d64c25b2f7e133 2015-12-15 20:06:16 +08:00
lunhao.guo ae980c19d2 fix the link error and compile error in windows and android platform 2015-12-09 20:18:37 +08:00
XiaoFeng 167aa9b648 Update console sub-module, update project template.json to meet file position change 2015-12-01 15:00:45 +08:00
zhangbin 47ea0dfb02 Update the reference of submodule cocos2d-console. 2015-11-04 10:43:30 +08:00
zhangbin bfa50de768 Update the reference of submodule cocos2d-console. 2015-11-03 16:06:12 +08:00
hugo 0dd0233ba7 update sdkbox console 2015-11-03 13:06:09 +08:00
geron-cn c6feb3d34d update submodule cocos2d-console 2015-11-02 17:49:26 +08:00
hugo 2bf7f8ae3f update console 2015-10-16 16:10:08 +08:00
zhangbin f25b62b4b5 Update the reference of submodule cocos2d-console. 2015-10-12 14:16:18 +08:00
zhangbin aaabe42e75 Update the reference of submodule cocos2d-console. 2015-09-16 11:01:52 +08:00
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