Commit Graph

190 Commits

Author SHA1 Message Date
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
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
minggo bde0a3d60d
don't copy not exist files when creating a new project (#18618) 2018-01-11 10:06:42 +08:00
James Chen d21af3b981 Some fixes after using ndk r16 clang to build android projects (#18531)
* [android] Fixes warning in UrlAudioPlayer.cpp and CCUserDefault-android.cpp

* Don't write 'using namespace std;' in header files.

* Uses std::unordered_map instead of std::map for Particle3D module.

* Updates external/config.json to v3-deps-141

* Continue to replace `gnustl_static` to `c++_static` for templates and test projects.

* Updates CCConsole.h/.cpp to resolve the following issue on Android:

jni/../../../../../cocos/base/CCConsole.cpp:321:28:   required from here
/Users/james/Software/android/android-sdk/ndk-bundle/sources/cxx-stl/llvm-libc++/include/utility:506:63: error: incomplete type 'std::__ndk1::is_move_assignable<cocos2d::Console::Command>' used in nested name specifier
                         is_move_assignable<first_type>::value &&
                                                               ^
make: *** [obj/local/arm64-v8a/objs-debug/cocos2dx_internal_static/base/CCConsole.o] Error 1

* Fixes a memory leak while addCommand and other minor changes.

* Updates tolua/cocos2dx.ini, don't bind Console::Command

* Adds CC_DLL for Console::Command

* Reverts tolua/cocos2dx.ini and ignore Console::[add Command addSubCommand getSubCommand delSubCommand].

* Ignores Console::getCommand.
2017-12-05 13:35:16 +08:00
minggo 5151dfd6f9
Remove ant projects (#18532)
* remove proj.android

* remove ant building and rename proj.android-studio to proj.android

* not pass --android-studio
2017-12-04 18:00:45 +08:00
minggo 9c67dcab9d
remove proj.android (#18529) 2017-12-04 11:26:43 +08:00
minggo a7a61e6a83
travis build android studio projects (#18515) 2017-12-01 17:29:34 +08:00
James Chen b191318e15 Auto hide home indicator for iPhoneX. (#18514) 2017-11-27 17:08:34 +08:00
minggo dacd8e664f
fix issue that can not generate archieve file with Xcode9 (#18498) 2017-11-24 10:38:41 +08:00
Mozart Louis bb479e4f6d Android Studio 3.0 + Switching to libc++ (c++_static) + Simplify PROP_* values + Adding default Proguard Config for cocos (#18470)
* Updated android build process to use c++_static

* Comment out org.gradle.jvmargs

* Updated all project in test directory

* Update C++ Template

* Update js and lua projects

* Update Proguard + Lower minSdkVersion to 14

* Added All PROP_* values + updated build.gradle

* Updated versions
2017-11-23 09:08:50 +08:00
James Chen 69e5a056e6 Uses Images.xcassets instead of several icon png files. (#18485)
* Uses Images.xcassets instead of several icon png files.

* Renames AppIcon.

* Sets AppIcon from Images.xcassets

* Uses Images.xcassets instead of several icon png files for template projects.

* Modify permission to 644
2017-11-21 15:31:29 +08:00
minggo 496de07633 don't have to set NDK_MODULE_PATH manually 2017-10-26 13:40:27 +08:00
minggo b275a3e2f0 fix conflict 2017-09-20 09:11:35 +08:00
James Chen 0c5ba220b1 Supports full screen for iPhone X and uses Storyboard for launch screen. (#18276)
* Supports full screen for iPhone X and uses Storyboard for launch screen.
cpp-empty-tests done.

* Supports full screen for iPhone X and uses Storyboard for launch screen.
cpp-tests, js-tests, lua-empty-test, lua-tests done.

* Removes unused UILaunchImages for test projects.

* Removes unused UILaunchImages for template projects.

* Adds LaunchScreen.storyboard / LaunchScreenBackground for template projects.

* Fixes lua template.
2017-09-19 15:01:19 +08:00
James Chen a73d5893b4 [android] Fixes AppAcitivity (Sub class of Cocos2dxActivity) is re-created which causes crash if launching app first time and re-opening from icon. (#18271)
* [android] Fixes AppAcitivity (Sub class of Cocos2dxActivity) is re-created which causes crash if launching app first time and re-opening from icon.

* Update AppActivity.java

* Update AppActivity.java
2017-09-18 15:12:30 +08:00
minggo 164cb98fe9 fix linking error on mac (#18266) 2017-09-14 17:27:41 +08:00
minggo 15b43659c2 update to use Android Studio 2.3.3 (#18214) 2017-09-01 17:46:26 +08:00
Jie Meng 9c35c90614 Fix android compile fail bug (#18166) 2017-08-16 17:44:11 +08:00
bulzipke b5d871d53c Hide virtual button by user control. (#18100)
* Hide virtual button by user control.
It want a lot of people, including me.

http://discuss.cocos2d-x.org/t/solved-android-navigation-bar/31760/3
http://discuss.cocos2d-x.org/t/android-cocos2d-v3-12-about-virtual-button/30811/5
http://joyplot.com/documents/2016/09/27/cocos2d-x-navigation-bar/
http://falstar.hateblo.jp/entry/2016/07/10/180112

* I also added the lua/js template.
Thank you for your work :)
2017-08-07 11:12:26 +08:00
minggo 0e26309602 remove bullet project (#17961) 2017-06-21 17:15:09 +08:00
pyrosphere 5ce38d14fe On XCode projects, removed specific SDK versions from framework paths. (#17929) 2017-06-15 09:53:32 +08:00
minggo 8fcf0d7fd9 fix gradle setting (#17896) 2017-06-05 11:35:48 +08:00
RickyZheng001 f8e325792b V3.15 (#17752)
* 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.
2017-04-27 09:25:20 +08:00
minggo ee84d9f12e update v3.15 2017-04-14 13:45:32 +08:00
minggo 270bcb28a5 do not set attributes in java (#17680)
if setting attribures in java code, then engine can not select GLES2/GLES3 dynamically
2017-04-10 17:41:53 +08:00
minggo 8a587a3681 [ci skip]fix some error for Android Studio project (#17655)
* use '/' for path separator on windows

* enable short commands
it is useful on windows because windows has length limitation of commands
2017-04-06 15:41:38 +08:00
minggo 9ed5127edc synchronize v3.15 2017-04-01 17:16:45 +08:00
minggo 9d81f16bc5 [ci skip]make android studio work for release mode (#17610)
* release mode of lua test case work with Android Studio

* add missing file

* fix error for debug mode

* make android studio work
2017-03-29 15:56:46 +08:00
pandamicro 5341f7517e Improve js template and test pages (#17575)
* Improve js template and test pages

* Update web ref
2017-03-27 11:03:51 +08:00
minggo db837ebdae remove unneeded test cases and fix parameter length limitation on windows
* delete unnneded test case on windows

* delete unneeded test cases

* avoid parameter length limit when building android on windows

* adjust project setting to delete unneeded test cases

* remove unneeded test cases for windows10

* remove unneeded test cases for tizen

* remove unnedded test case for android
2017-03-22 13:43:12 +08:00
James Chen ab9104f3ce Updates templates for switching AudioEngine in AppDelegate.cpp. (#17555) 2017-03-22 11:19:25 +08:00
rh101 f8eccb9608 Added VS2017 support in project files (#17548)
* [libcocos2d.vcxproj, libcocos2d.vcxproj.filters] Removed entries for non-existent files that were causing "Build is out of date" issues in Visual Studio
[project.pbxproj] Removed entries for non-existent file

* [libcocos2d.vcxproj.filters] Renamed CCStencilStateManager.h extension to .hpp.

* [libcocos2d.vcxproj, libcocos2d.vcxproj.filters] Removed entry for file CCDownloaderImpl.h which does not exist.

* Changed extension of CCStencilStateManager.hpp to .h

* Added support for VS2017 in project files.
2017-03-20 09:36:07 +08:00
minggo ebdae8c2da use different separator on different platforms and make path length short (#17542) 2017-03-17 11:54:36 +08:00
pandamicro f0061c3ddc [ci skip] Improve js template and update web ref (#17510)
* Improve js templates

* Update web ref
2017-03-16 09:42:51 +08:00
pandamicro 0eec73ba43 Bindings fix and assets manger ex fix (#17115)
* Fix custom event being discard during event emission

* Fix tilemap black line issue

* Fix auto bindings config

* Adapt websocket to new memory model

* Improve cocos2d_specifics code stability

* Fix issue with get_or_create_js_object function

* Improve memory usage in function wrapper invocation

* Use JS Function bind to avoid memory tracking issues

* Support size parameter to collect total byte size before update process

* Fix download resuming issue on Android

* Remove temporary assets when temporary manifest is invalid or out of date

* Use version compare handle to compare manifests versions

* Support max concurrent tasks setting & download verify callback

* Add Manifest::Asset conversion

* Avoid crash caused by wrappers

* Sync implementation of tested and published AssetsManagerEx from Cocos Creator

* Fix linux compilation issues
2017-03-15 16:09:02 +08:00
Bin Zhang 010a724149 Solve the error when building Android Studio project. (#17504) 2017-03-15 15:45:50 +08:00
minggo fd74e4d6aa update build tool version and gradle version (#17499)
after this PR, can see 3rd party cpp files in Android Studio
2017-03-15 09:56:20 +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
James Chen 4f6340c919 [win32] Updates template project configuration files. (#17491)
* [win32] Updates template project configruation files.

* [win32] Re-adds libcurl.lib for cpp template.
2017-03-14 11:17:15 +08:00
minggo 5ae8a95c6f [ci skip]make all tests and template support Android Studio (#17389)
* make all tests and template support Android Studio

* use grable 2.2.3
2017-02-21 17:58:30 +08:00
CocosRobot d07794052f Update license to 2017 (#17362)
* Typo: CopyRight -> Copyright

* Copyright update: chukong-inc.com -> Chukong Technologies Inc.

* [js files] Copyright update: 2014 -> 2014-2017

* [cpp files] Copyright update: 2014 -> 2014-2017

* Copyright update: 2015 -> 2015-2017

* [js files] Copyright update: 2014 -> 2014-2017

* Copyright update: 2016 -> 2016-2017

* Copyright update: 2013 -> 2013-2017

* Copyright update: 201?-201? -> 201?-2017

* License year fixes.

* Liscene year fix in CCRay.cpp

* Updates license years in CCGLProgramState.h & CCGLProgramStateCache.h
2017-02-14 14:36:57 +08:00
Dale Stammen 9381152ef1 removed support for Windows 8.1 store and phone (#17311) 2017-02-08 09:46:47 +08:00
Wilson E. Alvarez ca28af0113 Fixed variable order in initializer lists (#17274) 2017-02-04 10:33:58 +08:00
Dmitry 1e1ac655b1 fixes for iOS 7 and earlier (#16879)
* initialize Director::_invalid on first init

* fix: Setting the GLView should be done after creating the RootViewController

* restore 2016 copyright on templates/cpp-template-default/proj.ios_mac/ios/AppController

* remove old iOS js and lua templates

* copy actual iOS templates from cpp to js and lua
2016-11-23 09:28:34 +08:00
minggo 84a102edf8 merge v3.13.1 back to v3 2016-09-15 10:08:28 +08:00
minggo 937525a4de prevent restarting activity on some events (#16525) 2016-09-06 16:12:49 +08:00
minggo 04fd2b16b2 merge v3.13 back to v3 2016-08-29 11:57:13 +08:00
minggo 3ce4134ab3 use java reflection to avoid API level dependent, use app-abi 10 (#16371)
* use java reflection to avoid API level dependent, use app-abi 10

* add license header
2016-08-17 13:55:26 +08:00
Greg Rynkowski 14b8fc0a71 Remove AppDelegate memory leak in Android projects (#16333)
* Remove AppDelegate memory leak from Android projects

AppDelegate object and all its members are never released.
As a solution I propose to use static unique_ptr that could destroy it
at the end of the application.

Issue:
https://github.com/cocos2d/cocos2d-x/issues/14110

* Correct code style in Android main.cpp files

- removed redundant headers (reduced dependencies)
- removed redundant code
- corrected code style
2016-08-08 10:53:04 +08:00
James Chen b135d512d2 Update copyright to 2016. (#16311) 2016-08-05 09:42:15 +08:00