minggo
b8e7f37eaf
Merge pull request #15640 from xpol/better-lua-print
...
Print as Lua 5.1 does and remove duplicate code.
2016-05-23 18:42:23 +08:00
Shulepov
758425cfd5
Refactor CCFileUtils-apple to remove code duplication ( #15645 )
...
* Refactor CCFileUtils-apple to remove code duplication of conversion from CCValue to NSObject and vise versa
* CCFileUtilsApple: rename helper functions
2016-05-23 18:26:19 +08:00
minggo
16a1605927
Merge pull request #15690 from halx99/patch-2
...
change if (fontName.c_str()) to if(!fontName.empty())
2016-05-23 16:04:14 +08:00
minggo
5caea3a197
Merge pull request #15692 from mogemimi/prevent-c4996-warning
...
Prevent too many C4996 warnings caused by ignoreAnchorPointForPosition()
2016-05-23 14:14:38 +08:00
Vladimir Perminov
b6d72e33d8
Fix password style text in UTF-16 ( #15620 )
...
* Fix password style text in UTF-16
Label used UTF-16 in internal.
Need string in UTF-8.
* Set correct char for Max and iOS
* Add test for TextFiledTTF Secure Text Entry
2016-05-23 09:48:15 +08:00
mogemimi
ad3c305172
Prevent too many C4996 warnings caused by ignoreAnchorPointForPosition()
2016-05-22 07:05:35 +09:00
halx99
86d148c24c
change if (fontName.c_str()) to if(!fontName.empty())
...
fix warnning, change if (fontName.c_str()) to if(!fontName.empty()), The first expression's value always true.
2016-05-20 23:10:28 +08:00
minggo
2c9716d714
Merge pull request #6927 from TimothyZhang/fix-cc-utf8-to-utf16
...
fixed bug of cc_utf8_to_utf16() when length!=-1
2016-05-20 14:59:06 +08:00
minggo
797cd50a6e
Merge pull request #15683 from hopstertv/enable-webview-local-storage-on-android
...
Enable WebView's local storage on Android
2016-05-20 14:40:22 +08:00
minggo
ff01ba76dd
Merge pull request #15667 from minggo/update-deps
...
update deps to support IPv6 only network
2016-05-20 13:38:03 +08:00
minggo
d95ee0f94c
Merge pull request #15687 from minggo/isnan-issue
...
fix compiling error on ubuntu 16.04 because of isnan
2016-05-20 11:54:39 +08:00
minggo
565225c302
update deps
2016-05-20 11:25:17 +08:00
minggo
8e1f1d2c14
fix compiling error
2016-05-20 11:19:40 +08:00
minggo
20dd401de1
Merge pull request #15685 from mogemimi/fix-audio-engine-linux
...
Fix gcc warnings and type mismatch issues in AudioEngine for Linux
2016-05-20 09:48:04 +08:00
mogemimi
0f3b36e834
Fix gcc warnings and type mismatch issues in AudioEngine for Linux
2016-05-20 01:39:40 +09:00
Greg Rynkowski
21fc67b358
Enable WebView's local storage on Android
...
Problem:
cocos2d::experimental::ui::WebView' local storage wasn't working on
Android. On iOS worked fine.
Solution:
Enable local storage of android.webkit.WebView in Android.
References:
https://developer.android.com/reference/android/webkit/WebSettings.html
http://stackoverflow.com/questions/5899087/android-webview-localstorage
2016-05-19 14:43:35 +01:00
minggo
3db84916d1
Merge pull request #15677 from mogemimi/refactor-audioengine
...
Refactor the AudioEngine-Linux to make more maintainable
2016-05-19 18:07:45 +08:00
minggo
9c0acf1e5d
Merge pull request #15619 from VisualSJ/v3_audio
...
audio search path (android)
2016-05-19 18:06:58 +08:00
zilongshanren
b154f274a5
Merge pull request #15410 from 1scaR1/up_v3
...
Make PageView indicator more tunable
2016-05-19 16:19:18 +08:00
minggo
99a0a149d1
Merge pull request #15681 from natural-law/v3
...
Update the reference of submodule cocos2d-console.
2016-05-19 13:44:15 +08:00
zhangbin
c68ecaffab
Update the reference of submodule cocos2d-console.
...
Solve the english grammar error.
2016-05-19 12:04:56 +08:00
zhangbin
2f5b53ad59
Update the reference of submodule cocos2d-console.
...
Solve the error when running cocos command if ~/.cocos is not existed.
2016-05-19 11:30:28 +08:00
mogemimi
09d839be35
Format the code to better align with cocos2d-x code style
2016-05-19 05:17:33 +09:00
mogemimi
7b61aca64e
Fix indentation and remove trailing whitespaces
2016-05-19 03:42:34 +09:00
mogemimi
3a80e7d8fb
Change 2 spaces to 4 spaces indentation
2016-05-19 03:34:04 +09:00
mogemimi
03be0de2fa
Remove unnecessary trailing semicolons
2016-05-19 01:40:00 +09:00
zilongshanren
4f5b140c15
Merge pull request #15673 from fusijie/add_comments_for_ps
...
add comments for ps.
2016-05-18 22:33:21 +08:00
fusijie
36113f507e
add comments for ps.
2016-05-18 22:25:43 +08:00
zilongshanren
9223d1d917
Merge pull request #15668 from zilongshanren/fix-issue-of-tizen
...
fix tizen related issues
2016-05-18 17:20:19 +08:00
minggo
a68ff0c856
Merge pull request #15671 from minggo/remove-build_native_sh
...
[ci skip]remove unneeded files
2016-05-18 16:46:10 +08:00
minggo
ecf181036a
remove unneeded files
2016-05-18 16:44:06 +08:00
zilongshanren
c4e6db4e9b
fix tizen related issues
2016-05-18 16:26:13 +08:00
minggo
25fea656c7
update deps to support IPv6 only network
2016-05-18 15:45:46 +08:00
pandamicro
a03c45ce62
Update network licenses and reformat
2016-05-18 14:29:54 +08:00
minggo
c6034787e4
Merge pull request #15664 from mogemimi/replace-ccassert-macro
...
Replace CCAssert macros with CCASSERT
2016-05-18 11:57:18 +08:00
minggo
a54251b854
Merge pull request #15659 from mogemimi/use-const-reference
...
Use const references whenever possible
2016-05-18 11:55:55 +08:00
minggo
fc16a9bae9
Merge pull request #15662 from natural-law/v3
...
Update the reference of submodule cocos2d-console.
2016-05-18 11:55:04 +08:00
mogemimi
320ec027f7
Replace CCAssert macros with CCASSERT
2016-05-18 01:49:35 +09:00
zhangbin
d6ffb27a7a
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3
2016-05-17 17:43:13 +08:00
zhangbin
2d00073653
Update the reference of submodule cocos2d-console.
2016-05-17 17:25:31 +08:00
minggo
50acf4c94b
Merge pull request #15660 from minggo/assetsmanager-test-issue
...
[ci skip]make AssetsManagerExTest can connect to the url
2016-05-17 17:15:45 +08:00
minggo
8c9138601c
make AssetsManagerExTest can connect to the url
2016-05-17 16:41:07 +08:00
minggo
3e396fedab
Merge pull request #15617 from pandamicro/v3
...
Some modifications merged from Creator
2016-05-17 13:43:41 +08:00
mogemimi
948f64631f
Use const references whenever possible
2016-05-17 13:17:56 +09:00
pandamicro
c96bd9a4df
Resolve local reference leak and function order
2016-05-17 12:06:28 +08:00
minggo
d7d52c1996
Merge pull request #15638 from MSOpenTech/v3-winrt-fix
...
V3: Winrt added updated .filters file for Windows 8.1 Universal cpp-tests project
2016-05-17 10:39:44 +08:00
minggo
f94a742c34
Merge pull request #15639 from Zropein/v3
...
Fixed APP_NAME for cpp, cpp-empty, js, and lua tests.
2016-05-17 10:32:47 +08:00
minggo
601460682e
Merge pull request #15641 from mogemimi/add-missing-references
...
Add missing references to avoid unnecessary copies
2016-05-17 10:28:08 +08:00
minggo
abe020e808
Merge pull request #15654 from minggo/ipv6-compatibility
...
Ipv6 compatibility
2016-05-17 09:25:14 +08:00
mogemimi
a1a8feed71
Add missing references to avoid unnecessary copies
2016-05-17 01:15:07 +09:00