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
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
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
ae980c19d2
fix the link error and compile error in windows and android platform
2015-12-09 20:18:37 +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
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
Bin Zhang