mogemimi
808a10429b
Fix some typos in comments and strings ( #16290 )
2016-08-02 15:29:23 +08:00
QingliWang
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
CocosRobot
dea3a83efc
[AUTO][ci skip]: updating cocos2dx_files.json ( #16272 )
2016-07-29 17:39:32 +08:00
minggo
7131451f1b
change to use api 19 ( #16248 )
...
* change to use api 19
* update deps version
2016-07-29 13:57:01 +08:00
CocosRobot
fbf74a49d5
[AUTO][ci skip]: updating cocos2dx_files.json
2016-07-29 01:38:42 +00:00
minggo
ddc5a90686
Merge pull request #16247 from minggo/js-template
...
[ci skip]fix JS template
2016-07-28 15:55:03 +08:00
minggo
fc36ce3c92
copy script
2016-07-28 10:40:08 +08:00
CocosRobot
9096e19ec7
[AUTO][ci skip]: updating cocos2dx_files.json
2016-07-28 01:59:39 +00:00
Vladimir Perminov
09aa7d9cf4
Win32 move unicode utils global. ( #16234 )
...
* Win32 move unicode utils global.
It need for easy converting utf-8 string in all code.
And use it api in user code also WinRT version.
* Move to CCUtils-win32
Also in WinRT version.
* Copyright
2016-07-28 09:57:29 +08:00
minggo
b74900fe70
fix js template
2016-07-27 16:57:03 +08:00
minggo
67ec4521e5
explicitly set app-abi to armeabi
2016-07-27 10:10:09 +08:00
CocosRobot
588ac1c70d
[AUTO][ci skip]: updating cocos2dx_files.json
2016-07-25 09:33:45 +00:00
minggo
358f247700
remove unneeded flag
2016-07-22 09:42:08 +08:00
minggo
a97906a280
Merge pull request #16184 from minggo/issue-16161
...
Issue 16161
2016-07-22 13:51:54 +08:00
minggo
5f2c1df448
use android 21 to fix compiling error
2016-07-22 10:53:56 +08:00
CocosRobot
235e65b835
[AUTO][ci skip]: updating cocos2dx_files.json ( #16174 )
2016-07-21 10:09:27 +08:00
CocosRobot
9c35dedb75
[AUTO][ci skip]: updating cocos2dx_files.json
2016-07-18 06:17:04 +00:00
Bojan Matić
727138b800
Fix browserVersion detection
...
Due to typo, the code meant for browser versions below 6.2 would
never run.
2016-07-14 08:24:12 +02:00
CocosRobot
eea229c101
[AUTO][ci skip]: updating cocos2dx_files.json
2016-07-13 04:38:56 +00:00
zhangbin
f4accbdf3e
Solve the error in command gen-templates & gen-simulator.
2016-07-13 09:42:05 +08:00
zhangbin
4408f28480
Solve the error in simulator project.
...
Remove unused files.
2016-07-12 17:33:43 +08:00
CocosRobot
ca28b5b603
[AUTO][ci skip]: updating cocos2dx_files.json
2016-07-11 04:04:47 +00:00
minggo
d4bd1d0c9a
fix conflict
2016-07-08 18:15:57 +08:00
minggo
826b142096
remove ide-support in framework project
2016-07-08 18:07:57 +08:00
minggo
3f60d1d886
remove code ide related codes in tempaltes
2016-07-08 17:17:23 +08:00
minggo
734d857ced
Merge branch 'v3.12' into merge-v312
2016-07-07 15:13:21 +08:00
pandamicro
d99a8f0f84
Made css style inline
2016-07-06 19:42:27 +08:00
pandamicro
96155a670f
Improve web template and update web ref
2016-07-06 13:54:55 +08:00
Ricardo Quesada
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
minggo
076e0b488b
Merge pull request #15980 from minggo/merge-v312
...
Merge v312
2016-06-29 09:41:30 +08:00
CocosRobot
2fbf3c9940
[AUTO][ci skip]: updating cocos2dx_files.json
2016-06-29 01:01:21 +00:00
pandamicro
6e54080e83
Fix style issue in html page
2016-06-28 21:59:37 +08:00
minggo
bbd837aefa
merge v3.12 back to v3
2016-06-28 17:53:50 +08:00
pandamicro
683a4bfec6
Fix tests for v3.12 web
2016-06-22 17:39:38 +08:00
CocosRobot
1c8ab4f504
[AUTO][ci skip]: updating cocos2dx_files.json
2016-06-20 05:41:22 +00:00
CocosRobot
eee0d14e8f
[AUTO][ci skip]: updating cocos2dx_files.json
2016-06-17 02:17:23 +00:00
CocosRobot
134a09da6f
[AUTO][ci skip]: updating cocos2dx_files.json
2016-06-16 07:51:35 +00:00
CocosRobot
600175a93c
[AUTO][ci skip]: updating cocos2dx_files.json
2016-06-16 03:10:20 +00:00
minggo
925e938724
Merge pull request #15839 from Shulepov/refactor_and_cleanup_RootViewController
...
Cleanup and refactor RootViewController
2016-06-15 14:17:05 +08:00
CocosRobot
77e71fa638
[AUTO][ci skip]: updating cocos2dx_files.json
2016-06-15 02:45:36 +00: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
Mikhail Shulepov
2cd7850427
Cleanup and refactor RootViewController
2016-06-14 19:55:31 +03:00
AlwynC
70000bcc84
Refine cpp template for iOS ( #15792 )
...
* Modified the layer follow action class to include a horizontal (x) and vertical (y) offset on the screen from which the node is to be followed.
* Added offsetX and offsetY parameters in Follow::clone() method.
* Added test case for follow action with offset.
* Made changes to the test case on follow action with offset.
* Added new createWithOffset function to create a follow action with offset.
* Modified the test case for followWithoffset to use the newly added createWithOffsets function for follow action.
* Refined the code for creating follow action with offsets.
* Modified test case for follow with offset as per updated create method.
* Code refined in createWithOffset method of follow action.
* Refined AppController.mm,RootViewController.mm and HelloWorldScene.cpp to load the cocos2d-x scene more effectively.Also included the procedure to dismiss the game scene and navigate back to iOS screen.
2016-06-08 10:55:02 +08:00
Shulepov
21ab86b5fe
iOS: ARC support #12518 ( #13937 )
...
* iOS: ARC support #12518
* Use @autoreleasepool with and without ARC
* Missed release for _viewController
2016-06-06 13:48:02 +08:00
CocosRobot
6a2f417498
[AUTO][ci skip]: updating cocos2dx_files.json
2016-05-30 09:23:17 +00:00
minggo
7516db0fa8
Merge pull request #15734 from pandamicro/v3
...
Support cc.view.setOrientation on web
2016-05-27 14:26:50 +08:00
pandamicro
1928d24bf0
Made templates support cc.view.setOrientation on web
2016-05-26 19:24:24 +08:00
BQ
93ed59bfb3
English grammar corrections.
2016-05-25 15:25:38 +01:00
BQ
6097c3abd1
English grammar corrections.
...
Make brackets consistent.
2016-05-25 15:18:57 +01:00
minggo
5019dc7878
don't strip png text
2016-05-24 10:06:28 +08:00
minggo
ecf181036a
remove unneeded files
2016-05-18 16:44:06 +08:00
minggo
74af3b5232
merge v3.11 back to v3
2016-05-12 09:50:03 +08:00
CocosRobot
530d890c6c
[AUTO][ci skip]: updating cocos2dx_files.json
2016-05-10 02:41:22 +00:00
minggo
2a712a0c3b
set correct package name
2016-05-09 18:14:53 +08:00
zilongshanren
e4d91f5577
fix tizen videoplayer issue
2016-05-06 18:43:26 +08:00
minggo
a5602cc732
merge v3.11 back to v3
2016-05-04 16:02:23 +08:00
CocosRobot
2184600565
[AUTO][ci skip]: updating cocos2dx_files.json
2016-05-04 01:24:01 +00:00
zilongshanren
c8d570c310
fix tizen template api-version issue
2016-05-03 11:22:34 +08:00
zilongshanren
675fe8e811
fix template project running
2016-05-03 11:02:22 +08:00
zilongshanren
b2b774b66b
fix tizen lua template
2016-04-29 17:59:10 +08:00
zilongshanren
915ea19e2e
fix tizen cpp template settings
2016-04-29 17:28:38 +08:00
Dale Stammen
8f37130569
added missing winrt template code for inplace EditBox
2016-04-28 08:37:55 -07:00
CocosRobot
011523cb56
[AUTO][ci skip]: updating cocos2dx_files.json
2016-04-28 01:52:35 +00:00
zilongshanren
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
Josh Bodily
614c3c47d7
Josh/winrt inplace editbox ( #15473 )
...
* WinRT in-place edit box
* Fix static analysis errors
2016-04-25 11:17:09 +08:00
minggo
7ccd05548e
Merge pull request #13936 from Shulepov/app_controller_synthesize_window
...
AppController: synthesize window #13285
2016-04-21 15:02:07 +08:00
mogemimi
85646b8d80
Fix warning C4305 while compiling AppDelegate with MSVC
2016-04-20 04:01:06 +09:00
Dale Stammen
4d7bf1f827
updated expiration dates of all winrt test app and template certificates
2016-04-19 09:07:30 -07:00
minggo
9c40277e48
Merge pull request #14980 from catinred2/dev
...
fix typo
2016-04-18 17:21:40 +08:00
CocosRobot
121e784484
[AUTO][ci skip]: updating cocos2dx_files.json
2016-04-18 07:48:59 +00:00
xpol
1e70fb5eb5
Remove include of cocos2d.h ( #15435 )
2016-04-18 15:09:21 +08:00
CocosRobot
f136e9d94e
[AUTO][ci skip]: updating cocos2dx_files.json
2016-04-18 01:43:40 +00:00
CocosRobot
d1ced49baa
[AUTO][ci skip]: updating cocos2dx_files.json
2016-04-14 01:57:22 +00:00
minggo
61a83aca2e
Merge pull request #15407 from minggo/sync-to-v3.11
...
Sync to v3.11
2016-04-11 12:53:52 +08:00
pandamicro
f9f9551645
Fix some issues
...
1. Action extendable in JSB
2. Fix cc.CallFunc callback parameter issue
3. Fix arrivalOrder property of Node
4. Upgrade trick for QQ browser <6.2
2016-04-11 11:11:34 +08:00
CocosRobot
02e3fca1fa
[AUTO][ci skip]: updating cocos2dx_files.json
2016-04-11 01:39:26 +00:00
pandamicro
e6d4beef8a
Merge pull request #15388 from pandamicro/v3
...
Issue fixes and update engine version
2016-04-07 23:15:39 +08:00
pandamicro
1ada222c36
Fix some issues
...
1. Action extendable in JSB
2. Fix cc.CallFunc callback parameter issue
3. Fix arrivalOrder property of Node
4. Upgrade trick for QQ browser <6.2
2016-04-07 22:40:32 +08:00
zilongshanren
6e3d69dded
Merge pull request #15336 from cocos2d/v3.10
...
V3.10
2016-03-29 11:23:11 +08:00
zilongshanren
1eacab01fb
fix windows platform simpleaudioengine include
2016-03-28 20:15:06 +08:00
zilongshanren
b879dce607
add audio SimpleAudioEngine.h search path back
2016-03-28 14:35:59 +08:00
minggo
488930119d
fix compiling error in new JSB project
2016-03-28 10:37:35 +08:00
Dale Stammen
ee05081f3a
fixed include paths
2016-03-23 12:14:12 -07:00
CocosRobot
970d5f09ff
[AUTO][ci skip]: updating cocos2dx_files.json
2016-03-22 12:55:27 +00:00
zilongshanren
8eb683310d
Merge pull request #15295 from CocosRobot/update_cocosfiles_1458635195
...
[AUTO][ci skip]: updating cocos2dx_files.json
2016-03-22 19:52:22 +08:00
CocosRobot
c7cbe2dda3
[AUTO][ci skip]: updating cocos2dx_files.json
2016-03-22 08:26:39 +00:00
Xpol Wan
e7864cdb89
Removed unnecessary search paths.
2016-03-22 16:04:12 +08:00
Xpol Wan
d6b2f08b30
The CC_TARGET_OS_* in xcodeproj are now not needed.
2016-03-16 13:20:53 +08:00
zilongshanren
af5c5ae1e8
Merge pull request #14777 from raksa/v3.10
...
prevent recompile when run Android app on Android Studio to device or Emulator.
2016-03-11 09:34:59 +08:00
Vladimir Perminov
2a201a5c4e
WinRT support key repeat and implement dispatchControlKey
2016-03-07 14:43:44 +03:00
CocosRobot
8f6da161d1
[AUTO][ci skip]: updating cocos2dx_files.json
2016-03-04 20:56:11 +00:00
Ricardo Quesada
21cd5d08f7
Merge pull request #15177 from ricardoquesada/cmake_fixes
...
"cocos new" fixes for cmake
2016-03-04 12:38:13 -08:00
CocosRobot
836a6ffa42
[AUTO][ci skip]: updating cocos2dx_files.json
2016-03-04 03:45:48 +00:00
Ricardo Quesada
5b3942fcbb
"cocos new" fixes for cmake
...
cmake for mac compiles. doesn't link since it needs iconv.
2016-03-03 19:21:30 -08:00
CocosRobot
c50630fdef
[AUTO][ci skip]: updating cocos2dx_files.json
2016-03-04 02:28:59 +00:00
CocosRobot
efff69a08d
[AUTO][ci skip]: updating cocos2dx_files.json
2016-03-03 07:52:55 +00:00
Ricardo Quesada
462f4f4c0a
Merge pull request #15156 from ricardoquesada/cmake_android_squash_2
...
cmake for android
2016-03-02 17:24:35 -08:00
Ricardo Quesada
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
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Mar 1 16:54:04 2016 -0800
Merge branch 'v3' into cmake_android
commit 8a5c9981192e344fffc9f14be5cb14f66eccfa24
Author: Chaoren Lin <chaorenl@google.com>
Date: Thu Feb 11 18:34:46 2016 -0800
Fix module name in Android template to match CMake project.
commit be85e19e852a9d5fbd6c58cea60c75fe47a5a576
Author: Chaoren Lin <chaorenl@google.com>
Date: Thu Feb 11 18:27:45 2016 -0800
Add missing platform specific source file to CMake project.
commit 705389ac6582107a381d0cbc56268eaa98ffc5c3
Author: Chaoren Lin <chaorenl@google.com>
Date: Wed Feb 10 19:21:12 2016 -0800
Find AndroidNdkModules.cmake relative to android.toolchain.cmake.
commit a10075e2cb30af2e1f9a30da99efac880658ad6b
Author: Chaoren Lin <chaorenl@google.com>
Date: Wed Feb 10 19:03:11 2016 -0800
Remove cpp-empty-test from project templates.
commit e070fcbf210b8628f75785e738202a80a95ac0ff
Author: WenhaiLin <wenhai.lin@chukong-inc.com>
Date: Mon Aug 31 09:56:03 2015 +0800
Fix CMake for Android Target
2016-03-02 16:51:54 -08:00
CocosRobot
fe979c6fdd
[AUTO][ci skip]: updating cocos2dx_files.json
2016-03-01 01:37:51 +00:00
CocosRobot
e6b727d94d
[AUTO][ci skip]: updating cocos2dx_files.json
2016-03-01 00:23:18 +00:00