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
0e26309602
remove bullet project ( #17961 )
2017-06-21 17:15:09 +08:00
5ce38d14fe
On XCode projects, removed specific SDK versions from framework paths. ( #17929 )
2017-06-15 09:53:32 +08:00
8fcf0d7fd9
fix gradle setting ( #17896 )
2017-06-05 11:35:48 +08:00
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
ee84d9f12e
update v3.15
2017-04-14 13:45:32 +08:00
ccb0c168d4
[android] Fixes that android studio project will be created with a default package name ‘org.cocos2dx.MyLuaGame’. ( #17674 )
2017-04-10 13:50:31 +08:00
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
9ed5127edc
synchronize v3.15
2017-04-01 17:16:45 +08:00
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
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
ab9104f3ce
Updates templates for switching AudioEngine in AppDelegate.cpp. ( #17555 )
2017-03-22 11:19:25 +08:00
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
ebdae8c2da
use different separator on different platforms and make path length short ( #17542 )
2017-03-17 11:54:36 +08:00
010a724149
Solve the error when building Android Studio project. ( #17504 )
2017-03-15 15:45:50 +08:00
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
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
b8edb47abb
[ci skip][win32] Updates lua template ( #17493 )
2017-03-14 11:57:41 +08:00
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
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
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
1baad6b962
Fix tizen compilation issue ( #17341 )
...
* fix tizen compile issue
* enable websocket test on tizen
* change application id of tizen projects
* improve cpp-tests websockets
* update template app id of tizen
* fix tizen cpp-tests in release mode
* update 3rd deps version
* bump external version to 123
2017-02-13 17:59:48 +08:00
ca28af0113
Fixed variable order in initializer lists ( #17274 )
2017-02-04 10:33:58 +08:00
5d41d3c65e
add cocos/editor-support into search path ( #17137 )
2017-01-10 11:57:01 +08:00
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
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
56e0e6f741
correct search path ( #16660 )
2016-10-08 14:44:18 +08:00
a6f3773aef
Luajit ( #16620 )
...
* update console
* load lua according architecture
* install android-13 in travis
2016-09-28 16:19:20 +08:00
84a102edf8
merge v3.13.1 back to v3
2016-09-15 10:08:28 +08:00
937525a4de
prevent restarting activity on some events ( #16525 )
2016-09-06 16:12:49 +08:00
93322eb728
Fixes lua template in release mode. ( #16501 )
2016-09-05 10:02:42 +08:00
04fd2b16b2
merge v3.13 back to v3
2016-08-29 11:57:13 +08:00
2c37be5d86
fix lua tempate error ( #16377 )
2016-08-17 16:09:48 +08:00
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
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
1cb506a5c5
fix compiling error if building for Android Studio ( #16317 )
2016-08-05 14:03:35 +08:00
b135d512d2
Update copyright to 2016. ( #16311 )
2016-08-05 09:42:15 +08:00
808a10429b
Fix some typos in comments and strings ( #16290 )
2016-08-02 15:29:23 +08:00
bbfd2d334c
Some bug-fix and quality assurance for Tizen support. ( #16281 )
...
* Support audio interruption and resume callback when change earphone status.
* Refactor keyevent callback and add makecurrent for compatible with different binary.
* Enable Tizen indicator.
* Remove the unnecessary evasobject in the window and refactor the function for glview mode.
* Fix the compatible issue between Tizen 2.3 and 2.4.
* Fix the wrong directory of script resources for HellLua template project.
* Create performance-test project for Tizen platform.
2016-07-31 22:32:59 +08:00
7131451f1b
change to use api 19 ( #16248 )
...
* change to use api 19
* update deps version
2016-07-29 13:57:01 +08:00
67ec4521e5
explicitly set app-abi to armeabi
2016-07-27 10:10:09 +08:00
358f247700
remove unneeded flag
2016-07-22 09:42:08 +08:00
5f2c1df448
use android 21 to fix compiling error
2016-07-22 10:53:56 +08:00
f4accbdf3e
Solve the error in command gen-templates & gen-simulator.
2016-07-13 09:42:05 +08:00
826b142096
remove ide-support in framework project
2016-07-08 18:07:57 +08:00
3f60d1d886
remove code ide related codes in tempaltes
2016-07-08 17:17:23 +08:00
afe36e4a00
feat: upgrades to GLFW v3.2
...
Inclues Mac and Win32 binaries
Includes udpated downlaod+compile Linux script
fixes github issue #11748
uses WINAPI instead of APIENTRY
it seems that it is being redefined somewhere... but I couldn't find
exactly where
2016-06-29 16:11:30 -07:00
51f4deee01
Add system label overflow ( #15827 )
...
* Add system font overflow
1. currently only iOS, Mac and Android platform are supported
add mac label overflow shrink
modify system font overflow test
fix warning and possible memory leaks
add ios system label overflow support
add iOS system font overflow support
fix iOS system font overflow
fix Mac System font overflow
add android system font clamp
add Android system font shrink
cleanup iOS shrink related code
fix Android system font clamp
add core text to project template
fix iOS tests project
fix mac and iOS shrink
improve iOS and Mac clamp feature
fix header file include path
* modify the comments, make it more clearer
2016-06-15 10:43:15 +08:00
93ed59bfb3
English grammar corrections.
2016-05-25 15:25:38 +01:00
6097c3abd1
English grammar corrections.
...
Make brackets consistent.
2016-05-25 15:18:57 +01:00
5019dc7878
don't strip png text
2016-05-24 10:06:28 +08:00
2a712a0c3b
set correct package name
2016-05-09 18:14:53 +08:00
a5602cc732
merge v3.11 back to v3
2016-05-04 16:02:23 +08:00
c8d570c310
fix tizen template api-version issue
2016-05-03 11:22:34 +08:00
675fe8e811
fix template project running
2016-05-03 11:02:22 +08:00
b2b774b66b
fix tizen lua template
2016-04-29 17:59:10 +08:00
482788c933
Add tizen support ( #15518 )
...
* add Tizen Support
* fix linter error
* fix tizen audio engine lua bindings config
2016-04-28 09:49:55 +08:00
9c40277e48
Merge pull request #14980 from catinred2/dev
...
fix typo
2016-04-18 17:21:40 +08:00
b879dce607
add audio SimpleAudioEngine.h search path back
2016-03-28 14:35:59 +08:00
e7864cdb89
Removed unnecessary search paths.
2016-03-22 16:04:12 +08:00
d6b2f08b30
The CC_TARGET_OS_* in xcodeproj are now not needed.
2016-03-16 13:20:53 +08:00
028f8c28e1
Squashed commit of the following:
...
commit 59e43a3c80f4af8998e4a14f6463bd7a91617d5f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Mar 2 15:19:48 2016 -0800
uses new naming convention for projects
uses _ instead of -
commit f97ba56608d48b17909649c8617ba9047b566196
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Mar 2 14:49:22 2016 -0800
fooling cmake for real
commit 20c2560f75eab952e5131b484284bf20cb07fe07
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Mar 2 14:43:05 2016 -0800
fooling cmake
commit a0ada44bc82941830f6c71219a1492d28c28c306
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Mar 2 14:26:59 2016 -0800
makes CMake for Mac happy
commit 656b4f5e2dd741215a4699db979fe1b0dce60298
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Mar 2 13:50:15 2016 -0800
linux fix
commit fa98aeac8505c764f4a69f15c8a8ff1123fad2a3
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Mar 2 11:18:18 2016 -0800
links correctly!
commit 9c56ce7143d3a35b44d33f246cec093ca9eaa7d9
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Mar 1 17:44:58 2016 -0800
Squashed commit of the following:
commit 2ef52723dae44204c047cb177d5a5670fb659c79
Merge: 8a5c998 25cf1f1
2016-03-02 16:51:54 -08:00
2ebe511a06
fix typo
2016-01-27 17:59:30 +08:00
ae980c19d2
fix the link error and compile error in windows and android platform
2015-12-09 20:18:37 +08:00
167aa9b648
Update console sub-module, update project template.json to meet file position change
2015-12-01 15:00:45 +08:00
7f10d6d894
Template: keep compatibility
2015-11-04 18:26:59 +08:00
517567c56c
Template : fix link libraries
...
1. GameController.framework in JS template
2. CFNetwork.framework in Lua template
2015-11-04 12:19:29 +08:00
65fafef044
Merge pull request #14209 from pandamicro/v3
...
Disable bitcode for all targets
2015-10-22 12:55:25 +08:00
4633a93631
Disable bitcode for all targets
2015-10-22 12:18:51 +08:00
316d37ad51
Merge pull request #14130 from jimrange/iconSplash
...
Fixed issues with the iOS icons and splash screens.
2015-10-22 12:17:02 +08:00
5c93c56d80
Updated Lua and JavaScript iOS Info.plist, iOS splash screens and iOS icons.
2015-10-21 11:11:02 -05:00
88bcaad518
General fixes:
...
- changed some delete operations to be deletions of arrays where applicable
- changed some "free" operations to "delete" where memory was allocated with "new"
CCPUScriptCompiler.cpp:
- added checks to see if temp1 and temp2 are non-null before dereferencing them
FileServer.cpp:
- changed the size of startFlag to be 13, seeing as the strcpy into it copies a string, "RuntimeSend:",
is already 12 characters long, but strcpy() attempts to copy the NULL terminator too.
2015-10-16 21:43:09 +02:00
4996fe5c1b
Solve the error in templates.
...
When creating project from template, the app name of android-studio project is not changed.
2015-09-09 16:08:15 +08:00
5cdfdf8497
[ci skip][Android Studio Projects]Update Gradle Plugin from 1.2.3 to 1.3.0
2015-08-18 22:37:00 +08:00
38edfea28a
Solve the error effect of lua portrait project created from template.
2015-08-14 17:20:21 +08:00
675d5efb39
Merge pull request #13151 from flashjay/patch-2
...
Update AppController.h
2015-08-12 13:43:39 +08:00
9fd88d6587
Optimize the lua & js templates.
...
The changes are used for generating templates of Cocos Framework.
2015-08-05 16:51:33 +08:00
3c2e66e425
Merge branch 'v3.7.1' of https://github.com/cocos2d/cocos2d-x into v3
...
# Conflicts:
# .travis.yml
# build/cocos2d_js_tests.xcodeproj/project.pbxproj
# build/cocos2d_tests.xcodeproj/project.pbxproj
# cocos/2d/CCFont.h
# cocos/2d/CCFontAtlas.cpp
# cocos/2d/CCFontAtlas.h
# cocos/2d/CCFontFreeType.cpp
# cocos/2d/CCFontFreeType.h
# cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Windows/libcocos2d_8_1.Windows.vcxproj
# cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.WindowsPhone/libcocos2d_8_1.WindowsPhone.vcxproj
# cocos/2d/libcocos2d_win10/libcocos2d.vcxproj
# cocos/cocos2d.cpp
# cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_studio_auto.cpp
# templates/cpp-template-default/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj
# templates/js-template-default/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
# templates/js-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
# templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj
# tests/cpp-tests/Classes/LabelTest/LabelTestNew.cpp
# tests/cpp-tests/Classes/LabelTest/LabelTestNew.h
# tools/bindings-generator
# tools/simulator/frameworks/runtime-src/proj.ios_mac/simulator.xcodeproj/project.pbxproj
# tools/travis-scripts/generate-bindings.sh
# tools/travis-scripts/generate-cocosfiles.sh
# tools/travis-scripts/travis_mac.yml
2015-08-02 22:28:27 +08:00
abbf7eabfc
Update AppController.h
2015-08-01 17:49:12 +08:00
875d01573a
[Android Studio Projects]Update Gradle from 2.2.1 to 2.4
2015-07-31 21:20:42 +08:00
70628c9dec
Fixed link errors on iOS/Mac
2015-07-29 13:59:58 +08:00
4d46a03797
Solve the error : the VS release configuration of lua template cause `cocos run` error.
2015-07-28 14:54:42 +08:00
e4a8aeee45
Fixed #12962 : Scene can't have std::vector member.
2015-07-24 11:16:45 +08:00
bd1f5b4a39
Merge pull request #12911 from natural-law/portrait-support
...
Fixed #12252 : Support new portrait projects from templates.
2015-07-23 15:38:32 +08:00
3addf38134
Fixed #12906 : Can't add custom member to cocos2d::Scene subclass.
2015-07-22 12:01:34 +08:00
a8b22f6886
Support new portrait project from lua templates.
2015-07-20 09:58:40 +08:00
45e0eda81c
Fixed compile error
2015-07-17 11:34:26 +08:00
451bedbaad
change sign team to none.
2015-07-07 22:02:35 +08:00
04ade7c16e
remove xcode scheme
2015-07-07 14:57:25 +08:00
302976b603
add shared scheme to iOS & Mac project.
2015-07-07 14:24:17 +08:00
4c88be9520
removes -fno-excpetion and -fexception from cmake
2015-07-06 12:09:50 -07:00
cbb073e905
Fixed Application may be created more than once on Android.
2015-06-23 16:58:38 +08:00
01cb135e77
Solve the error in the VS project of templates.
2015-06-17 18:06:09 +08:00
b84531ea04
add librecast to js and lua templates
2015-06-17 13:39:28 +08:00
f3765a4c5f
Fix physics 3d macro include issue
2015-06-12 15:58:43 +08:00
a6649e24fe
fix resource not copy issue on windows
2015-06-01 18:59:27 +08:00
c491b6a5c1
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3
2015-05-25 17:01:29 +08:00
3298145eb5
Support build & run Android Studio project in console.
2015-05-25 16:53:36 +08:00
203203a92d
Merge pull request #12001 from andyque/upgrade-rapidjson-to-1.0.2
...
upgrade rapidjson to 1.0.2
2015-05-25 15:18:15 +08:00
81d562803b
upgrade rapidjson to 1.0.2
2015-05-25 11:43:03 +08:00
bulzipke