Commit Graph

36653 Commits

Author SHA1 Message Date
leda f5e35cfe4f check android Gradle config for release mode (#18804)
* update getCocosCommandPath function

* fix typo error in proguard-rules

* update gradle judge OperatingSystem API

* keep default ndk-build
2018-05-11 15:07:19 +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
Kazuma Ito 9942b06592 Fix link in README (#18776)
In #18644, the link `webchat.freenode.net` was deleted.
But, it has not been completely deleted.
So, I deleted the remaining links.
2018-04-25 09:51:24 +08:00
leda a5c52607d5 check test cases and fix small bugs before 3.17 release (#18786)
* update edit box H alignment case

* improve label no-break-space test case

* fix label test cases bug

* add GetterSetter define for the placeHolder of TextField

* fix event condition bugs on ParticleTest.lua
2018-04-25 09:50:53 +08:00
leda 9275dda539 adjust android / linux build config for cocos CLI (#18780)
* make android native build default mode clear

* update android native build comment

* temp change sub-module, need change before merge

* change tests project cmake file dir

* change PROP_BUILD_TYPE to PROP_BUILD_TYPE

* change var name for build.gradle

* modify others 3 tests project config

* make compile_sdk_version same as target_sdk_version

* update sdk version in CI config script

* update sub-module to cocos2d

* let the cmake build of template  project more clear

* update cocos-console submodule
2018-04-24 13:46:20 +08:00
François Perrad 2991a18fae CMake: avoid unsafe header path when cross-compiling (#18782) 2018-04-23 09:04:45 +08:00
leda ed0288f22d replace ptr_fun with lambda, avoid compile error (#18783)
* update trim func, avoid compile error using c++17

* resume wrong deleted
2018-04-20 18:04:19 +08:00
CocosRobot 68adbb08ec [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#18779) 2018-04-20 17:50:34 +08:00
leda fbad734633 Revert "fix issue that render texture will have wrong effect if using with global z order (#18629)" (#18777)
This reverts commit 38864456bf.
2018-04-19 09:37:05 +08:00
leda bed8c0ac77 add bullet include dir to cocos mk (#18774) 2018-04-19 09:27:15 +08:00
leda 8ada72aa5c update web Spine to 3.6.39 2018-04-19 09:26:37 +08:00
Slack-Moehrle 1ffd22f313 updated README (#18760)
corrected that we support Android Studio. Fixed language for CMake introduction and usage.
2018-04-08 09:35:16 +08:00
Jordi Vilalta Prat 712b093b27 Don't count spaces at the end of line as part of the line width (#18751) 2018-04-04 11:53:16 +08:00
leda 383c5afa6b Fix sqlite link error,CMake support iOS app Icon (#18746)
* make pack iOS app on Device easier

* fix sqlite link error

* fix app no Icon on iOS when CMake generate Xcode project

* remove useless info.plist source add

* rollback default iOS platform to device

* update cmake readme for ios build

* change android default build to ndk-build, not cmake
2018-04-03 11:18:22 +08:00
sp-andres-barrera d66af06112 Support for non-breaking characters in label (#18753)
* Added non-breaking character check function

* Check for non-breaking characters in words when formatting label text

* Added nbsp again as space character (removed in previous PR https://github.com/cocos2d/cocos2d-x/pull/18147)
2018-04-02 10:27:26 +08:00
halx99 6317e35f01 Fix issue #18724 (#18741)
see issue: https://github.com/cocos2d/cocos2d-x/issues/18724
2018-03-20 10:13:33 +08:00
CocosRobot 542f064c37 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#18740) 2018-03-19 10:15:40 +08:00
CHP 64a81ca13b Simplify CI scripts (#18734)
* 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

* Simplify CI scripts

* Remove easy_install

* Update before-install.sh

* Update run-script.sh

* Init pyenv
2018-03-19 09:21:51 +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
leda 86ea3a8aee cmake add collect headers list, unify the logic of source add (#18722)
* fix mistake for ios lua template

* auto select headers depend on sources

* change cmake "cocos_build_app" from macro to function

* fix cmake dll repeat copy

* update travis srcipt

* add header list for cocos lib

* add header list in cmake files

* re-add include dir Classes

* improve template cpp var name

* remove func get_headers_by_sources

* cmake add simulator header list

* make source and header collect more clear

* improve macos app pkg

* improve ios pkg, run failed

* revert the ios pak logic, keep older

* expand var APP_BIN_DIR scope

* fix use sqlite3 error on linux

* fix win32 compile error

* remove multi-add mistake

* try to fix python install issue on travis

* fix js-tests build on android

* uninstall old python in travis

* add travis  python print info

* fix command ll to ls -l

* remove useless link

* PYTHON_BIN adapt homebrew python
2018-03-14 13:51:29 +08:00
Dimon4eg d32f33056f Fix no-break space size (#18661)
* fix warnings

* added test

* fix warning

* fix no-break space size

* Correct code
2018-03-13 09:40:24 +08:00
Jordi Vilalta Prat 239b63e207 Fix infinite loop when counting text lines on Android (#18710)
In some situations, breakText() can return 0, which leads to an infinite
loop. In that case we just increase the index so the measuring doesn't
get stuck.
2018-03-09 10:01:17 +08:00
leda 185d7706f0 add cmake guide docs (#18719)
* improve cmake docs

* cmake docs improve

* unify format
2018-03-08 16:08:13 +08:00
deyongzhong c087be314c ^fix crash when the error msg is too long (#18715) 2018-03-08 15:33:14 +08:00
CocosRobot e5d4a54bff [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#18718) 2018-03-08 15:32:40 +08:00
gestern 84be684e38 Adds support for executing sequential commands separated by a delimiter (#18686) 2018-03-08 10:51:21 +08:00
AIGRIND 607507d97e Get ValueMap by reference (#18684)
* Get value map by reference

* Get ValueMap by constant reference
2018-03-08 10:49:29 +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
Dimon4eg 74daac0751 Support Belarusian language (#18658)
* Support Belarusian language

* Fixed code duplication - moved language convertion code to ccUtils

* added Belarusian language for all platforms

* Fix ios/mac build errors
2018-02-11 09:19:47 +08:00
TankorSmash 7e0a0435ac Fix warning for converting int to float (#18672)
Could use a static_cast but it doesn't seem to be the style
2018-02-08 09:26:22 +08:00
leeda edee97278f V3 android cmake support, add mac/ios support (#18646)
* CMake build improvements

* android cmake support

* Enable proguard for cocos2d

* examples & test cmake support

* add android build type param to gradle.properties file

* less warnings

* update all android configs to recomended settings

* fix network cmake error

* fix js-tests cmake error

* android build config, add cmake

* android build config, add cmake

* add lua share lib

* android lua cmake build fix

* fix

* luajit test

* run fail, still

* fix js-warning

* correct lua main include

* lua test project cmake support android

* try to add lua-template cmake support

* lua template fix

* js_tests support cmake on android

* js-tests improve

* cmake support js-template

* test to realise prebuild

* cmake improve, no feature

* improve templates cmake

* refactor cmake struct

* correct cpp-tests cmake

* cpp-templates cmake improve

* typo fix

* cmake struct refator

* change default option

* adapt new project struct

* uniform cmake test style

* add_dependencies to support make -j

* little struct improve

* little fix

* adapt cmake bin dir

* little improve about cmake version

* change build all tests condition

* add source_group for Xcode

* add mark source files

* add more mark source code

* add template project to test

* add macos info.plist template

* add pak macos for all project

* lua test icon fix

* not consider lua project for now

* modify pak method

* add another ios toolchain

* add ios system library

* update ios toolchain, and reduce ios compile errors

* reduce error

* make ios engine lib compile pass

* cpp-empty-test ios bundle

* cpp-tests ios support

* js-tests ios support

* templates project support ios

* fix the way of lua-tests package

* try to fix lua-template on macOS

* comment lua-template sim file

* improve display on xcode

* update cmake readme

* check android compile again

* fix android compile error

* fix linux cmake res error

* update deps version, for cmake

* fix lua_template linux compile error

* close android cmake support for now

* review template android share library name

* change PROP_BUILD_TOOLS_VERSION version to 27.0.1

* change android compile version

* make `PROP_APP_PLATFORM` back, add comments for android native build

* Revert "make `PROP_APP_PLATFORM` back, add comments for android native build"

This reverts commit 272ddc19886891b9502cde070753a870c0fdb588.
2018-02-08 09:24:33 +08:00
leeda f1dbc310ba fix a mistake of "V3 multisampling support #18632" (#18674) 2018-02-05 09:03:57 +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
Dimon4eg b3285edb56 Speed up windows build (#18662)
* added precompiled headers

* Configure Visual Studio projects to use precompiled headers
2018-01-29 16:36:38 +08:00
leeda 18a6d8241d update Copyright. might need manual fix later (#18659)
* Copyright use python script updated. might be fix by manual later

* Revert "Copyright use python script updated. might be fix by manual later"

This reverts commit 49e99418e4da1fd02afda448ddeb16210f5e8c71.

* re modify copyright, consider utf-8-sig encoding

* another situation, add Copyright before  "Permission is hereby granted"

* Revert "another situation, add Copyright before  "Permission is hereby granted""

This reverts commit ee82591d32353c7ce2e146fe51ef447433b47571.

* another situation, add Copyright before Permission is hereby granted

* change "Copyright (c) 2016-2016 Chukong Technologies Inc." to " Copyright (c) 2016 Chukong Technologies Inc."

* script modify copyright, consider is cocos copyright or not

* change "Copyright (c) 2017 Chukong Technologies Inc." to "Copyright (c) 2016 Chukong Technologies Inc."

* manual fix, not fix audio related

* change "2016-2016" to "2016"
2018-01-29 16:25:32 +08:00
Jeff Wang e0b5034982 Update CCConsole.cpp (#18649) 2018-01-22 09:23:45 +08:00
minggo e88a05e49a
Fix RenderTexture DepthAndStencil issue on Android (#18648)
* Fixing issue where Stencil and Depths buffers would not function for a render texture if you backgrounded an application, and then resumed.

* Fixing typo: bufffer -> buffer
2018-01-21 19:07:49 +08:00
minggo bd84264399
Update README.md 2018-01-19 16:55:38 +08:00
newnon 2ff42bb38e V3 static analize fixes (#18638)
* fix different problems founded by static analize

* fix bad render assert

* Fix misprint

* reverted calloc in CCScheduler
2018-01-19 13:40:41 +08:00
CHP 27a1312d1e Disable 2 appveyor android build configurations (#18645)
* Simlpify appveyor script, remove unused functions

* Setup android builds: cpp_test, cpp_empty, cocos_new for appveyor

* Use absolute path for download-deps.py

* PushAppveyorArtifacts

* Disable 2 appveyor android build configurations
2018-01-19 13:39:04 +08:00
CocosRobot 4a23e754b2 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#18647) 2018-01-19 09:28:46 +08:00
newnon 5d006192aa V3 multisampling support (#18632)
* Multisampling support

* fix opengl initialization with multisampling

* fix merge conflict

* reverted default attributes
2018-01-19 09:28:22 +08:00
monkey256 5ddf8fb596 Fix a crash bug when the UserDefault.xml file is empty. (#18626)
* Fix a crash bug when the UserDefault.xml file is empty.

* Fix a crash bug when play multiple timeline animations.

* Fix a crash bug when loading .plist files.

* Fix code style.
2018-01-19 09:25:58 +08:00
newnon 7e27c250b1 android emulator stensil fix (#18637)
* android emulator stensil fix

* Android emulator fix changed to comment
2018-01-19 09:24:53 +08:00
newnon 58077edc00 Add blend function to Text (#18631) 2018-01-19 09:19:36 +08:00
张世康 677b5a171b remove unuseful content (#18644) 2018-01-18 17:48:42 +08:00
CocosRobot 63767d5550 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#18642) 2018-01-18 17:47:46 +08:00