Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
35,448 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

35448 Commits

Author SHA1 Message Date
Ricardo Quesada b830b7de4c fix: add code/resources to reproduce issue_15594 
github issue #15594
 2016-05-25 09:00:32 -03:00
pandamicro 8692ee176c Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3 
Conflicts:
	cocos/network/HttpAsynConnection-apple.m
	cocos/network/HttpClient-android.cpp
	cocos/network/HttpClient.cpp
	cocos/network/HttpCookie.h
	cocos/network/HttpRequest.h
	cocos/network/HttpResponse.h
	cocos/network/SocketIO.cpp
	cocos/network/WebSocket.h
 2016-05-25 19:19:27 +08:00
minggo 4e92b82571 Merge pull request #15716 from cezheng/bug/ios_httpclient_ssl 
correct assign to equal in cert trust expression
 2016-05-25 18:44:01 +08:00
pandamicro 8d5c102d75 Update bindings generator 2016-05-25 18:36:16 +08:00
pandamicro 2c05ecc3cd Fix Component event issue 2016-05-25 18:36:02 +08:00
pandamicro 896aeb2d0c Fix android compilation issue with thumb mode 2016-05-25 18:35:38 +08:00
minggo c4a40618f5 Merge pull request #15715 from dumganhar/dlfree-fix 
dlfree fix for HttpClient, the instances of Ref or its sub classes should be released by CC_SAFE_RELEASE rather than CC_SAFE_DELETE.
 2016-05-25 18:34:29 +08:00
Ce Zheng e4bf6584db correct assign to equal in cert trust expression 2016-05-25 18:34:05 +09:00
minggo 47891b81af Merge pull request #15712 from mogemimi/use-nullptr-instead 
Use nullptr instead of 0 or NULL
 2016-05-25 13:56:52 +08:00
minggo c8c57696be Merge pull request #15705 from minggo/jsb-debug-issue 
lock mutext to get element from g_queue
 2016-05-25 13:55:34 +08:00
James Chen 1db3c1644d dlfree fix for HttpClient, the instances of Ref or its sub classes should be released by CC_SAFE_RELEASE rather than CC_SAFE_DELETE. 2016-05-25 13:54:13 +08:00
Ricardo Quesada 9ad3db0635 fix: make PolygonCode cleaner 
not sure if this fixes the bug, but it makes the interfaces cleaner.

Github issue #15154
 2016-05-24 20:57:40 -03:00
mogemimi 1e04cb5950 Use nullptr instead of 0 or NULL 2016-05-25 03:09:11 +09:00
Ricardo Quesada 23c5c18c91 Merge pull request #15646 from Rypac/fix_quadcommand_crash 
Fix crash due to reallocation of shared indices memory
 2016-05-24 11:29:28 -03:00
Ricardo Quesada 735dce1e91 Merge pull request #15711 from ricardoquesada/issue_15630 
fix: update damping in physics
 2016-05-24 10:54:55 -03:00
Ricardo Quesada 02a9c9aae3 fix: update damping in physics 
github issue #15630
 2016-05-24 10:53:23 -03:00
alecmilne 5daaa6e49b Adding setBounce to webview (#15623) 
* Adding setBounce to webview

This makes the .bounces of the scrollview section of webview publically accessible

When set to true it stops the grey over scroll of webviews

* Adding empty function for setBounces to Android

* Adding empty setBounces function for tizen

* Adding comments for empty Android and Tizen setBounce functions

* Small comment text change
 2016-05-24 18:27:59 +08:00
minggo fff7a78efe lock mutext to get element from g_queue 2016-05-24 15:59:00 +08:00
minggo d1cf94f3f1 Merge pull request #15702 from minggo/disable-remove-png-text 
don't strip png text
 2016-05-24 11:33:50 +08:00
minggo 2fd6680829 Merge pull request #15701 from mogemimi/fix-function-name-typo 
Fix typo in function name: Keybard -> Keyboard
 2016-05-24 10:53:44 +08:00
minggo 01333a272b Merge pull request #15700 from Shulepov/fix_spriteframecache_testcase 
Fix test cases with PVRTC textures loading
 2016-05-24 10:30:13 +08:00
minggo 5019dc7878 don't strip png text 2016-05-24 10:06:28 +08:00
mogemimi 38fd8ebca9 Fix typo in function name: Keybard -> Keyboard 2016-05-24 10:14:36 +09:00
Mikhail Shulepov 8d1aad0f96 Fix test cases with PVRTC textures loading on devices that don't support this formats 2016-05-23 18:10:00 +03:00
Ce Zheng ce807225f8 use manifestUrl from remote version 
In case if local version file is very old, and remote version has
changed the manifest url ever since, this fix will make sure that
AssetsManagerEx will download the correct manifest file
 2016-05-23 20:03:04 +09:00
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