Commit Graph

507 Commits

Author SHA1 Message Date
CocosRobot 7ef5745003 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#18821) 2018-05-15 10:20:46 +08:00
leda 391f30a3f3 beauty cmake format, reduce duplicate defines (#18799)
* reduce cmake module duplicate

* make module use more clear, correct cmake style

* keep default physics option

* delete the modules distributed with cmake

* unify the cmake files format

* use AndroidNdkModules at cmake sys modules

* add cmake comments for win

* update cocos2dx files list, manually
2018-05-02 15:33:01 +08:00
CocosRobot 542f064c37 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#18740) 2018-03-19 10:15:40 +08:00
CHP 883d501d18 Add cocos new tests to travis CI (#18703)
* Fix win32 cpp-template, speedup appveyor, add cocos new CI configuration

* fix cocos new for win32

* Add cocos new test to travis CI

* Remove mac_cocos_new_test

* install_linux_environment, gradlew build

* unify android setup

* Install andorid to android-ndk

* Set NDK_ROOT

* lua-tests set proper path

* Android build only debug

* Refactoring

* Linux verbose output

* Linux verbose output

* Clean up appveyor CI

* Fix gen-bindings

* pyenv install latest python

* pyenv init

* eval pyenv init

* split android to cpp and lua
2018-03-15 09:36:27 +08:00
CocosRobot 5fc30360a7 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#18716) 2018-03-08 10:05:14 +08:00
leda 50ecf00115 cmake support win32 ,and support generate&use prebuilt libs (#18683)
* fix win32 prebuilt error, and set cmake as default android native build

* cpp-template support msvc

* add msvc version check

* add -D_USRLUASTATIC, fix lua lib cmake compile error

* fix cpp-empty-test res copy dir, add function needed

* improve msvc res copy

* refactor cmake copy dll logic

* fix cpp-tests compile error

* refactor copy dll temp

* refactor win32 exe using dlls

* js-project compile support cmake using msvc

* improve res mark for win32

* update the way of lua project res mark

* add D_USRLUASTATIC for lua project

* unify RELEASE Release to Release, add CMAKE_CONFIGURATION_TYPES

* improve VS shows targets, add folder

* improve mac/ios res mark

* reduce useless comments

* unify cpp src include variable

* refactor cpp test project  package logic

* improve pkg app logic

* start support prebuilt libs for cpp project using cmake

* improve prebuilt libs generate

* expand js/lua support prebuilt libs on mac

* adapt IDE generate libs path

* start do prebuilt for android

* improve the way of using external libs for prebuilt

* prebuilt libs support cpp-empty-test on android studio

* cpp-tests prebuilt libs, and remove useless

* start to improve libs using, to adapt prebuilt

* improve cpp tests prebuilt on android

* prebuilt support lua & js test on android

* prebuilt support cpp&js template

* rename prebuilt variabl, detail androd config

* finish android support prebuilt using cmake

* fix cmake script run in windows error

* reduce variable name length

* improve the way of win32 use dlls to adapt prebuilt

* loosen pick js/lua engine lib condition

* self review and start check linux build

* unify compile option location

* strict copy dlls condition

* improve libs link order

* start redo the way of copy dlls

* unify dlls copy logic

* fix linux res copy error

* update cmake copy file path in linux

* make prebuilt dir if needed, and divide Debug and Release dir

* cmake win32 divide Debug and Release dir well

* comment Lua Template project, for the unfinished lua simulator support

* add simulator cmake file

* start support simulator

* simulator support cmake build on macOS

* fix simulator compile error on win32

* add simulator prebuilt support

* improve mark cocos app macro

* improve cmake template project format

* improve cmake app files format

* fix format improve mistake

* detail cmake readme

* improve readme, useless comments

* add game.rc to template project

* check travis openssl version

* try update travis openssl

* upgrade travis openssl

* change openssl link

* change to upgrade openssl

* re install python with upgrade openssl

* add comment for macro and func, improve variable name
2018-03-08 09:47:57 +08:00
CocosRobot f75172b42b [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#18687) 2018-02-24 10:36:15 +08:00
CocosRobot 140c186b33 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#18665) 2018-02-02 13:36:44 +08:00
CHP 8c1c3476f6 Fix win32 cpp-template, speedup appveyor, add cocos new CI configuration (#18663)
* Fix win32 cpp-template, speedup appveyor, add cocos new CI configuration

* fix cocos new for win32
2018-01-30 09:20:44 +08:00
CocosRobot 82b0dc9bc5 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#18625) 2018-01-16 13:43:50 +08:00
CocosRobot fe69b07e75 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#18540) 2017-12-07 13:45:26 +08:00
CocosRobot 190e1239bf [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#18535) 2017-12-05 18:04:27 +08:00
CocosRobot c594692d69 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#18440) 2017-11-03 14:19:47 +08:00
CocosRobot 50a0e91620 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#18435) 2017-11-03 09:56:43 +08:00
CocosRobot d42098e2c4 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#18431) 2017-11-02 11:17:04 +08:00
CocosRobot f7c987e349 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#18430) 2017-11-01 17:36:39 +08:00
CocosRobot f3e456c8bc [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#18344) 2017-10-09 09:28:15 +08:00
CocosRobot 925432deb1 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#18215) 2017-09-06 09:09:26 +08:00
CocosRobot 54586d06a4 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#18081) 2017-07-17 16:51:50 +08:00
CocosRobot 81d70adece [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#18052) 2017-07-12 09:50:15 +08:00
CocosRobot aa89054f8e [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17959) 2017-06-21 16:35:47 +08:00
CocosRobot 320bf97066 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17957) 2017-06-21 14:34:55 +08:00
CocosRobot 204a08d4fd [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17932) 2017-06-15 14:57:33 +08:00
minggo 4ca29ac1cf Merge v3.15.1 (#17897)
* remove APP_SHORT_COMMANDS setting (#17722)

some developers report it will cause error on Windows though i can not reproduce it. It is strange, the setting is used to resolve command length limitation on Windows.

* Particle font size should be a const value (#17676)

* Particle font size should be a const value

* Minor fix: CCStencilStateManager.hpp -> CCStencilStateManager.h in xcode project.

* JSB SocketIO.connect supports to pass a CA cert file (#17736)

* JSB SocketIO.connect supports to pass a CA cert file

* The second parameter of SocketIO.connect function is probably a `option` object. JSB just ignores it.

* The optimization for huawei. (#17832)

* The optimization for huawei.

* setAnimationInterval fix for all platforms.

* disable debug

* include fix.

* Uses better configuration for huawei optimization (#17838)

* Uses better configuration for huawei optimization

* Updates jar file and uncomment fps controlling code

* [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17840)

* update release not and version (#17845)

* [android] Removes an unused variable sRegistered in Cocos2dxActvity.java. (#17861)

* Updates jar to resolve warning while packaging APK file. (#17863)

* update release date (#17870)

* fix compiling error
2017-06-05 13:37:50 +08:00
CocosRobot a857ebe831 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17848) 2017-05-22 16:47:08 +08:00
CocosRobot 56cad142ab [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17712) 2017-04-18 09:12:21 +08:00
CocosRobot 487490def0 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17693) 2017-04-13 17:59:19 +08:00
CocosRobot 7ae2e9ebd0 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17626) 2017-04-01 14:45:38 +08:00
CocosRobot a1772418b1 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17524) 2017-03-16 14:16:56 +08:00
CocosRobot 87b4d7d54d [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17507) 2017-03-15 16:23:50 +08:00
CocosRobot 0536f6dc74 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17458) 2017-03-07 14:34:39 +08:00
CocosRobot 06f2d415f7 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17392) 2017-02-22 11:38:58 +08:00
Chaoren Lin d14f4270aa Use ndk-build with Android Studio. (#15676)
* Use ndk-build integration in Android Studio.

* Update build.gradle

* Update build.gradle

* Update build.gradle
2017-02-20 11:14:36 +08:00
CocosRobot 126c983ca9 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17375) 2017-02-17 10:17:46 +08:00
CocosRobot 59a15ac1e4 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17366) 2017-02-14 16:04:59 +08:00
CocosRobot 62e759b9a1 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17350) 2017-02-13 15:36:30 +08:00
CocosRobot 671861c710 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17322) 2017-02-08 13:57:29 +08:00
CocosRobot 3d51645d3d [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17319) 2017-02-08 10:42:18 +08:00
CocosRobot 1bc016b354 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17232) 2017-01-19 14:15:08 +08:00
CocosRobot#Set 69217f0e8b [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically 2017-01-05 01:40:38 +00:00
CocosRobot#Set 7950719e83 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically 2016-12-29 02:31:01 +00:00
CocosRobot e2100ce88c [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#16950) 2016-12-02 14:47:45 +08:00
CocosRobot 2d18d703a0 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#16810) 2016-11-04 14:07:25 +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
CocosRobot 23ff5fc51f [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#16676) 2016-10-11 11:40:11 -07:00
CocosRobot c046257efc [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#16630) 2016-09-30 09:44:34 +08:00
CocosRobot b6536e8d9f [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#16499) 2016-09-02 10:44:55 +08:00
CocosRobot e33aa63226 [AUTO][ci skip]: updating cocos2dx_files.json 2016-08-30 09:20:13 +00:00
minggo 04fd2b16b2 merge v3.13 back to v3 2016-08-29 11:57:13 +08:00
CocosRobot 6d7140d4af [AUTO][ci skip]: updating cocos2dx_files.json (#16439) 2016-08-24 17:47:51 -07:00