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

771 Commits

Author SHA1 Message Date
Hao Wu b4ca8c1489 Merge pull request #15 from pandamicro/spritepolygon 
Add SpritePolygon JSB bindingsJSB bindings
 2015-06-15 15:47:02 +08:00
子龙山人 86b6ea702a Merge pull request #12342 from WenhaiLin/v3-37-android-studio-fix 
[ci skip]Android Studio projects:Fixed compile error.
 2015-06-15 14:48:42 +08:00
WenhaiLin 518de1ff57 [ci skip]Android Studio projects:Fixed compile error. 2015-06-15 14:42:45 +08:00
pandamicro d0db40c4a6 Merge pull request #12080 from linshun/v3 
issue #12078 added audio, network, physics, platform and storage group.
 2015-06-15 12:45:11 +08:00
pandamicro 19ef0e0983 Fix indent 2015-06-12 13:01:13 +08:00
Dale Stammen 0f64a2d192 removed obsolete override of setViewPortInPoints 2015-06-11 07:59:52 -07:00
子龙山人 03814a569d Merge pull request #12256 from WenhaiLin/v3-simpleaudio-fix 
SimpleAudioEngine:Fixed thread safety problem on android.
 2015-06-11 14:30:36 +08:00
pandamicro 6dfe937cae Merge pull request #11892 from dabingnn/v3FrameBufferObject 
V3 frame buffer object
 2015-06-11 14:04:30 +08:00
Huabing.Xu 10352c40b2 Merge branch 'v3' into v3FrameBufferObject 
# Conflicts:
#	cocos/2d/CCCamera.h
 2015-06-10 10:16:42 +08:00
iris-wy 79b3d70b60 fix bug #12200 
solve warning ""Service Intent must be explicit: Intent {
act=com.enhance.gameservice.IGameTuningService }""
 2015-06-09 18:43:46 +08:00
Huabing.Xu b79eec0b20 fix grid bug for viewport 2015-06-09 17:24:30 +08:00
Huabing.Xu ef4978f0cd move viewport to experimental namespace 2015-06-09 16:21:50 +08:00
WenhaiLin 6fec9c40b0 SimpleAudioEngine:Fixed thread safety problem on android. 2015-06-09 15:07:35 +08:00
Huabing.Xu 97b387560b revert some accidental changes 2015-06-09 14:06:11 +08:00
lite3 f1d879f7ed remove old path When added existing new searchPath 2015-06-08 13:34:45 +08:00
Huabing.Xu 133ef90c09 Merge branch 'v3Viewport' into v3FrameBufferObject 
# Conflicts:
#	cocos/renderer/CCFrameBufferObject.h
 2015-06-06 18:16:22 +08:00
pandamicro 6216e74a38 Merge pull request #12165 from gyf19/v3 
HttpClient Android supports gzip
 2015-06-04 22:00:13 +08:00
Huabing.Xu ad1f7c472c add render buffer render target for color attachment 2015-06-04 11:18:35 +08:00
Dale Stammen 38c9490f4d don't delete rendering thread. SpiderMonkey needs to stay on same thread 2015-06-03 09:19:05 -07:00
gyf19 164e4c8314 HttpClient Android supports gzip 2015-06-03 19:41:14 +08:00
子龙山人 883f250f6a Merge pull request #12137 from WenhaiLin/v3-text-line-height 
Fixed the text line height calculation is wrong with system font on Android.
 2015-06-03 16:24:38 +08:00
WenhaiLin 88697bf136 Remove unused function. 2015-06-02 16:38:06 +08:00
WenhaiLin 67d0088103 Fixed the text line height calculation is wrong with system font on Android. 2015-06-02 16:23:40 +08:00
子龙山人 2c611693c6 Merge pull request #12123 from WenhaiLin/v3-UserDefault-robustness 
Improve UserDefault's robustness on Android.
 2015-06-02 10:11:19 +08:00
WenhaiLin 9d8225aae8 Improve UserDefault's robustness on Android. 2015-06-01 15:09:11 +08:00
Huabing.Xu 27d0f6328f origin code of viewport 2015-06-01 14:26:08 +08:00
linshun 09b52331d1 issue #12078: added renderer group and removed core and support group. 2015-06-01 13:43:56 +08:00
Dale Stammen e0c65c203a Merge branch 'v3' into v3-uwp 2015-05-29 08:09:05 -07:00
子龙山人 039c0036be Merge pull request #12072 from iris-wy/v3 
Add enhance service  API
 2015-05-29 15:32:06 +08:00
Dale Stammen 05d33ac0c8 removed old WP8 files 2015-05-28 14:08:25 -07:00
linshun ef39251d14 issue #12078: added platform group 2015-05-28 15:47:40 +08:00
iris-wy bbfc33dfd2 format 
format
 2015-05-28 11:03:49 +08:00
iris-wy 9e477303f1 delete useless TAG 
delete useless TAG
 2015-05-28 10:55:10 +08:00
iris-wy 0007799794 modify Enhance API 
modify Enhance API
 2015-05-28 10:47:12 +08:00
Dale Stammen 9ee4b4af1e Merge branch 'v3' into v3-winrt-audio 2015-05-27 11:54:21 -07:00
anniruddh.koppal 4501a53cfa Added MP3 support to simple audio engine 2015-05-27 10:57:26 -07:00
minggo 999de9072a Merge pull request #12003 from minggo/remove-unneeded-function 
remove uneeded function
 2015-05-25 16:33:38 +08:00
minggo db0caf68c6 remove uneeded function 2015-05-25 09:50:48 +08:00
andyque 03e8f16a8a add vs2015 support 2015-05-21 13:55:01 +08:00
Dale Stammen aa7876aefc remove deprecated methods 2015-05-20 07:55:10 -07:00
Dale Stammen cada493685 remove deprecated methods 2015-05-20 07:51:52 -07:00
WenhaiLin a569d877ba [ci skip]Remove unnecessary code. 2015-05-20 18:05:46 +08:00
WenhaiLin df3548673f Remove unnecessary files. 2015-05-20 10:19:32 +08:00
minggo e700ef6d30 Merge pull request #11856 from WenhaiLin/v3-support-android-studio 
Add Android Studio support
 2015-05-18 16:17:24 +08:00
WenhaiLin 26f094b1a7 Remove unnecessary files 2015-05-18 16:02:05 +08:00
WenhaiLin 6dd3108e42 Rename module 2015-05-18 15:01:20 +08:00
Vladimir Perminov bfb3fbb1c0 Revert _checkPath 2015-05-17 19:24:57 +03:00
Vladimir Perminov 295e8532d2 FileUtilsWin32 correct use all unicode version winapi 
Move to FileUtilsWin32 implements:
isDirectoryExistInternal
isDirectoryExist
createDirectory
removeDirectory
removeFile
renameFile

And use common convert to wide char.
 2015-05-17 12:40:14 +03:00
WenhaiLin dc8492948e Add Android Studio support 2015-05-15 16:37:43 +08:00
iris-wy 68ec7c8ca1 Add enhance service API 
Add enhance service  API
 2015-05-15 14:29:22 +08:00
minggo 5e776381aa Merge pull request #11820 from Dimon4eg/v3 
Fix crash in web view if illegal character in url (Android only)
 2015-05-15 10:12:54 +08:00
Ricardo Quesada 989848a358 fixes memory leak 
improves performance a little bit
 2015-05-14 17:24:27 -07:00
minggo 0a3e6338f1 Merge pull request #11834 from pandamicro/v3_origin 
Sync fixes in Cocos2d-JS
 2015-05-14 13:38:18 +08:00
pandamicro 8577055d5a Implement localStorage.clear on Android 2015-05-14 10:40:25 +08:00
dkorchinskiy 9d7e5e5edc Fix crash in web view if illegal character in url (Android only) 2015-05-13 14:56:07 +03:00
cpascal 134355d763 Fix compile error: using any of CC_USE_JPEG=0, CC_USE_PNG=0, CC_USE_TIFF=0, CC_USE_WIC=0 
When I don't want to use TIF file,
Cocos2d-x ccConfig.h's style is..
#define CC_USE_TIF 0

But CCImage.cpp just check wheather defined or not..
 2015-05-13 20:52:32 +09:00
minggo 5e87bd307b Merge pull request #11798 from WenhaiLin/v3-support-vs2015 
Add support for visual studio 2015.
 2015-05-13 09:37:12 +08:00
Dale Stammen f1fe802442 updated winrt keyboard support to support physical keyboard 2015-05-12 09:20:10 -07:00
WenhaiLin c70bac7bb4 Add support for visual studio 2015. 2015-05-12 16:26:28 +08:00
Dale Stammen 351a898a70 removed CC_PLATFORM_WP8 2015-05-08 09:19:13 -07:00
minggo a718c11eb6 Merge pull request #11724 from andyque/fix-binding-generator 
fix upstream compile error
 2015-05-07 11:47:20 +08:00
andyque db95034798 fix android compile error 2015-05-07 10:37:19 +08:00
Jongryul Kook dfe30e159f Need JNIEXPORT for -fvisibility=hidden 2015-05-06 14:24:48 +09:00
WenhaiLin 26c9be7881 Add FileUtils::getSuitableFOpen[window-universal] 2015-05-04 16:06:04 +08:00
WenhaiLin 1839564fbb Merge branch 'v3-dev-get-suitable-f-open' of https://github.com/perminovVS/cocos2d-x into v3.7 2015-05-04 10:16:47 +08:00
minggo 4acd231f89 merge v3.6 2015-04-30 13:46:08 +08:00
WenhaiLin 1950498b0a Replace tab with space. 2015-04-29 18:41:10 +08:00
Wenhai Lin 1d9ff11837 VideoPlayer:Fixed can't play video on Android 2.3.x 2015-04-29 18:32:59 +08:00
minggo 2d2f0aac59 fix indent 2015-04-27 16:25:24 +08:00
minggo 8c4cecca0d fix indent and translate Chinese comment to English 2015-04-27 16:22:54 +08:00
minggo c0b2433bb5 Merge branch 'v3' of https://github.com/qiutaoleo/cocos2d-x into check-filename-case-on-windows 2015-04-27 15:45:23 +08:00
WuHao 9496a48800 Merge branch 'v3.6' of https://github.com/cocos2d/cocos2d-x into v3 2015-04-24 18:29:23 +08:00
zhangbin 61cf0ad28b Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3-jsb 2015-04-23 15:46:19 +08:00
Dale Stammen ac8755868d need to call Cleanup() if app is terminating 2015-04-22 19:13:12 -07:00
Dale Stammen b78f830ed8 cleaned up Draw() 2015-04-22 19:11:42 -07:00
Dale Stammen 4119b0f10d cleaned up Draw() 2015-04-22 19:11:29 -07:00
Dale Stammen 22daece170 made Cleanup() public 2015-04-22 19:08:11 -07:00
Dale Stammen c3335551b8 added EGL_PLATFORM_ANGLE_ENABLE_AUTOMATIC_TRIM_ANGLE 2015-04-22 19:07:48 -07:00
samuele3hu 7c77bc9587 Add the PolySprite support and adjust the project setting on the different platform 2015-04-23 00:51:47 +08:00
Dale Stammen 0f3ff6f762 Merge branch 'v3' into v3-winrt-typo-fix 2015-04-21 18:18:00 -07:00
Dale Stammen 84a47000b5 rename -win to -winrt 2015-04-21 18:17:18 -07:00
Dale Stammen aec086a473 convert BGR and RGB to GUID_WICPixelFormat24bppRGB 2015-04-21 18:16:54 -07:00
Dale Stammen 516966a96f check for PixelFormat::DEFAULT 2015-04-21 18:11:56 -07:00
Dale Stammen 0c47df5df2 fixed typo. Changed KEY_BACKSPACE to KEY_ESCAPE in comments 2015-04-21 06:21:32 -07:00
Dale Stammen 83b68ef693 added comment on how back button event is handled 2015-04-20 18:36:58 -07:00
Dale Stammen 50f381f070 added CCLOG message to describe how to handle Windows Phone back button event 2015-04-20 18:30:52 -07:00
Dale Stammen 4169ebf5c8 Windows Phone 8.1 back button and terminate app support 2015-04-20 10:43:34 -07:00
Dale Stammen e00b0dfbd9 Merge branch 'v3' into v3-winrt-backbutton 2015-04-20 08:17:16 -07:00
htl 2476f2b52d fixed win32 application return code 2015-04-20 18:27:21 +08:00
WenhaiLin dc768dbd8c Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-jsb-merge 2015-04-20 10:06:48 +08:00
Dale Stammen ec378b612e added listener if back button event not handled by app 2015-04-19 18:53:10 -07:00
Dale Stammen a97d5c5370 added support for hardware back button on Windows Phone 8.1 2015-04-19 16:31:30 -07:00
Vladimir Perminov 694b9adc1e Add FileUtils::getSuitableFOpen 
win32 fopen only ansi encoding.
if filePath contains utf8 characters fopen fail.
AudioCache FileFormat::OGG bag, can't open file, if filePath contains
utf8.

Need make all filename for fopen correct encoding.
Only Win32 FileUtils::getSuitableFOpen return
StringUtf8ToAnsi(filename),
other platform return filename

all fopen use FileUtils::getSuitableFOpen
 2015-04-19 14:00:27 +03:00
Dale Stammen f1f0c5a653 start of back button support 2015-04-17 15:47:52 -07:00
Dale Stammen 79f312d101 call pause on correct thread 2015-04-17 09:31:02 -07:00
Dale Stammen 2ccff5671a fix for encoding images with WIC 2015-04-17 09:20:23 -07:00
andyque d3a06de6d6 remove system zlib dependency since we use our own prebuilt version of 
zlib now.
 2015-04-17 17:24:33 +08:00
zhangbin 1f491cf656 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3-jsb 
Conflicts:
	build/cocos2d-wp8.sln
 2015-04-16 17:04:07 +08:00
minggo 97f150a89f Merge pull request #11452 from MSOpenTech/v3-remove-wp8 
V3 remove WP8 project files
 2015-04-16 14:32:11 +08:00
Dale Stammen b1c9c34c19 added Windows Image Component support for Windows 8.1 Universal App 2015-04-15 09:19:38 -07:00
Dale Stammen 7d22e49642 only needed if _MSC_VER < 1900 2015-04-15 09:18:48 -07:00
Dale Stammen 68430ce4fa added Windows Image Component support for Windows 8.1 Universal App 2015-04-15 09:18:23 -07:00
Dale Stammen b700798287 removed WP8 project files 2015-04-15 07:13:54 -07:00
Wenhai Lin 2dd88e8be5 Fixed JNI illegal start byte error 2015-04-15 18:20:52 +08:00
zhangbin 8c2413aa54 Add submodule js-bindings & html5. 2015-04-14 15:20:46 +08:00
Dale Stammen 272bb35246 Merge branch 'v3' into v3-wp8-fix 2015-04-08 07:29:45 -07:00
andyque 24c0c8d811 fix wp8 compile issue 2015-04-08 18:01:56 +08:00
minggo 4d9e376a18 Merge pull request #11284 from perminovVS/v3-dev-image-format-detect-log 
Log message can't detect image format
 2015-04-08 10:52:56 +08:00
Michael Sotnikov f962e14b43 replace const_cast with mutable in path getters; 
more getters (is*/get*) became const;
 2015-04-07 17:15:15 +03:00
Vladimir Perminov ba06886e01 GLViewImpl initWithRect bug size 
glfwCreateWindow not guarantees create windows need size, watch real
create size and change setFrameSize( see declaration glfwCreateWindow)

Example Windows 7, if request height size > Desktop height make window
size: Desktop height - height Caption.
 2015-04-06 14:24:22 +03:00
Vladimir Perminov 3931273a58 Log message can't detect image format 
Wrong log message DDS and KTX check image format(other format no log
message).
isS3TC and isATITC protected, no use dev code.

Log message if format unknown
 2015-04-04 13:19:47 +03:00
Daiki Asahi fc92acf587 remove interlevel argument. 2015-04-03 16:43:39 +09:00
Huabing.Xu 98371e4fbb Merge pull request #11267 from WenhaiLin/v3-at01 
Disable MessageBox when the device does not have an accelerometer on WinRT.
 2015-04-03 11:53:07 +08:00
WenhaiLin fdba25cdde Disable MessageBox when the device does not have an accelerometer on WinRT 2015-04-03 11:51:00 +08:00
Dale Stammen d8b6a0aaf9 removed unused method 2015-04-02 09:11:19 -07:00
Dale Stammen 47b338e4e6 fix deprecated warnings 2015-04-02 09:08:26 -07:00
Dale Stammen 957bf48790 fire foreground and background events 2015-04-02 09:07:44 -07:00
WenhaiLin aaae566b7b Performance: Fixed lag if Director::setContentScaleFactor is called frequently 2015-04-02 23:35:56 +08:00
Vladimir Perminov b7279524d6 Win32 correct rename file 
Old version, check GetLastError even if all ok, but LastError can be set
other code.
Write log info.
 2015-03-31 13:52:40 +03:00
minggo b03900bbbf fix doxygen comment 2015-03-27 17:09:54 +08:00
SuYaohui 3d772df930 Add comment 2015-03-27 14:43:24 +08:00
SuYaohui 17bd26e9d4 Add comments 2015-03-27 11:39:31 +08:00
WenhaiLin f13065a038 [ci skip]Update comments 2015-03-25 11:07:11 +08:00
WenhaiLin 153d697f1a [ci skip]Update comments. 2015-03-25 10:59:04 +08:00
WenhaiLin 89f9ae044d [ci skip]Update comments 2015-03-24 20:29:13 +08:00
WenhaiLin 9dd778edb0 [ci skip]Update comments 2015-03-24 20:23:51 +08:00
WenhaiLin 2caff4e64d [ci skip]Update comments 2015-03-24 14:12:58 +08:00
WenhaiLin 1450dfbc7b Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-doxygen 2015-03-24 11:26:10 +08:00
minggo 4973de2b25 add more doxygen document 2015-03-24 11:15:40 +08:00
minggo 14574bdd41 add doxygen comment of CCFileUtils.h 2015-03-24 10:34:44 +08:00
WenhaiLin 78a8ba7f98 [ci skip]Update comments 2015-03-23 22:17:59 +08:00
SuYaohui d8a033c2ef Action,Sprite,TmxTiledMap,UTF8,GLView 2015-03-23 18:37:28 +08:00
Dale Stammen fc94659fd5 updated precompiled shaders for WP8 2015-03-20 23:50:48 -07:00
andyque a29a298ec3 fix wrong comment 2015-03-20 09:49:34 +08:00
minggo 0648ac7ca0 Merge pull request #11004 from SuYaoHui/cocosapi 
[ci skip]NodeGrid,Config,NS,ApplicationProtocol,ProgressTimer
 2015-03-19 21:47:32 +08:00
SuYaohui 5e236fd753 progressTimer,ApplicationProtocol 2015-03-19 21:42:31 +08:00
minggo 8e32933dd3 Merge pull request #10340 from seobyeongky/network_bugfix2 
receive content data even though status code is not 2xx
 2015-03-19 21:12:51 +08:00
SuYaohui c295952c71 NodeGrid,Config,NS,ApplicationProtocol 2015-03-19 21:03:28 +08:00
lyubomirv 2aec39ad56 Added Bulgarian language. 2015-03-17 15:14:02 +02:00
Dale Stammen 65c83378d0 Merge branch 'v3' into v3-wp8-fix 2015-03-16 20:22:28 -07:00
minggo f7d5a16734 Merge pull request #10873 from konopka/fix_compiler_override_warnings 
Fix compiler override warnings
 2015-03-17 10:38:19 +08:00
Dale Stammen e2a5eb2f9f updated to Angle ddbf057c52 2015-03-16 08:18:26 -07:00
minggo f25be54e95 Merge pull request #10671 from kpkhxlgy0/v3 
enable setWritablePath on platform win32 and mac
 2015-03-16 14:57:26 +08:00
Martin Konopka cd12d08a52 Get rid of compiler warnings: 'func' overrides a member function but is not marked 'override' [-Winconsistent-missing-override] 2015-03-14 19:33:15 +01:00
Nite Luo 3194da4e7d Merge pull request #10720 from darkdukey/hide_cursor 
Hide cursor
 2015-03-13 10:48:15 -07:00
byeonggee.seo a2274162b5 merged 2015-03-12 10:06:53 +09:00
minggo 8e6d9d5dd2 Merge pull request #10740 from newnon/v3_windows_network_path 
Windows network path fix
 2015-03-10 11:25:53 +08:00
Jongryul Kook 0d65dd13be Fix CCDevice-ios.mm to have the right alpha color for a stroke effect. 2015-03-09 21:20:17 +09:00
Dale Stammen a9479a1585 updated WP8 precompiled shaders 2015-03-08 21:42:27 -07:00
Sergey de284c98ce MinGW build fix 2015-03-05 11:11:13 +03:00
Sergey Perepelitsa 215fe8a0c9 Windows network path fix 2015-03-05 11:10:03 +03:00
Nite Luo 49912c2f62 clean up the formatting 2015-03-02 23:29:15 -08:00
Chad 395c14f07d Hide Cursor - Feature Request #8766 
Added the ability to hide or show the cursor on desktop builds.
 2015-03-02 23:21:18 -08:00
kpkhxlgy0 99dea9395d enable setWritablePath on platform win32 and mac 2015-02-28 18:21:57 +08:00
Nite Luo dbba9e36a1 Merge pull request #10431 from vovkasm/dev/fix-win32-resource-search-path 
Fix win32 resource search path to be relative to the executable.
 2015-02-25 20:24:07 -08:00
minggo 5d8071bdcf Merge pull request #10597 from loadrunner/v3 
added Romanian language
 2015-02-26 10:51:46 +08:00
loadrunner 9e310ba272 added Romanian language 2015-02-25 17:25:19 +02:00
minggo c2479adc59 Merge pull request #10549 from mogemimi/fix-typo 
Fix typo in Image::Format
 2015-02-25 09:32:58 +08:00
mogemimi 9e7ce0cd85 Fix typo in Image::Format 2015-02-24 02:36:20 +09:00
mannewalis 21dbc29ad1 adding CC_DEPRECATE(version) macro 2015-02-17 13:01:53 -08:00
Dale Stammen 0801160a37 added precompiled Particle3D shaders 2015-02-16 11:28:24 -08:00
minggo 3a4e9ced46 Merge pull request #10442 from Dhilan007/v3-accelerometer-fix 
Fixed Accelerometer has lagged on iOS
 2015-02-12 17:20:07 +08:00
sawada_yasuharu cf8a7cd6da Changed the option to be passed to calculate bounding rect size for 
strings.

As an option, NSStringDrawingUsesLineFragmentOrigin and
NSStringDrawingUsesFontLeading are passed, the result size is differ
from the size which actually strings are rendered.
 2015-02-12 15:30:46 +08:00
WenhaiLin 20ad425407 Fixed Accelerometer has lagged on iOS 2015-02-11 16:28:43 +08:00
Vladimir Timofeev 653bf1549d win32: Search resources in the executable directory by default instead of the current directory. Because new default location is much more predictable. 2015-02-09 02:23:01 +03:00
byeonggee.seo 753335726a receive content data even though status code is not 2xx 2015-02-03 16:28:23 +09:00
minggo 18a45e36eb Merge pull request #10271 from Dhilan007/v3-systemfont-win32-fix 
Label:Fixed system font can't display the proper text when the text contains '&' on win32.
 2015-01-29 13:56:11 +08:00
WenhaiLin 05db3bfd72 Fixed system font can't display the proper text when the text contains '&' on win32. 2015-01-29 11:55:49 +08:00
Wenhai Lin 4a218ea3e2 Fixed game awaked by the clock on Android 2015-01-28 15:30:52 +08:00
minggo 4ac50f2c26 Merge pull request #10200 from Dhilan007/v3-webview-baseurlfix 
Fixed sets the page's base URL for WebView doesn't work.
 2015-01-26 13:51:08 +08:00
Wenhai Lin 81198583f1 Fixed sets the page's base URL for WebView doesn't work. 2015-01-23 18:30:12 +08:00
kompjoefriek ca48c5e5dd Fixed lots of compiler warnings 
- signed / unsigned mismatches
- using int as bool
- Removed throw() from CCFrame.h, why is explained here:
http://www.gotw.ca/publications/mill22.htm
 2015-01-23 02:02:33 +01:00
Dale Stammen e5b54f8c47 updated precompiled shaders for wp8 2015-01-21 10:50:44 -08:00
minggo fde86c7fd2 Merge pull request #10127 from Dhilan007/v3-systemfont-alphafix 
Fixed the alpha channel of text color of system font not take effect
 2015-01-21 11:09:27 +08:00
minggo 9f24b9a350 Merge pull request #10090 from Dhilan007/v3-issue10089 
Fixed lose the precision of label's dimensions
 2015-01-21 10:51:27 +08:00
Wenhai Lin b20d59c596 Fixed the alpha channel of text color of system font not take effect[android] 2015-01-20 17:34:13 +08:00
WenhaiLin 415bbeba21 Fixed the alpha channel of text color of system font not take effect 2015-01-20 16:04:14 +08:00
WenhaiLin f2c6a48976 Fixed lose the precision of label's dimensions 2015-01-20 11:46:43 +08:00
Dale Stammen 56d8e62409 added support for device orienation change. Fixed gravity for winrt landscape flipped 2015-01-19 09:38:49 -08:00
Dale Stammen 7b6b02d338 catch exception for older winrt tablets not supporting accelerometer report interval 2015-01-16 15:36:16 -08:00
Dale Stammen 5988cb520d added precompiled shader for ccPositionTextureColor_noMVP_vert and ccUIGrayScale_frag shader for UIScale9Sprite" 2015-01-16 14:59:08 -08:00
Dale Stammen 7b3154a7ee updated precompiled shaders for WP8 2015-01-16 11:19:32 -08:00
HoneyCat 41f53d6607 added checkfilename in win32 FileUtils 
make win32 check filename case like linux
 2015-01-16 17:24:54 +08:00
WenhaiLin 6a2ac7aaf8 [ci skip]Fixed log level within the CocosPlayClient 2015-01-15 18:21:03 +08:00
Dale Stammen ef816a1bb9 fixed handling of default font 2015-01-14 11:10:58 -08:00
Dale Stammen 32c14710e7 allow custom shaders for WinRT Universal App 2015-01-14 10:37:04 -08:00
minggo 1e2029598d Merge pull request #9936 from Dhilan007/v3-cocosplay 
Integrate CocosPlayClient
 2015-01-14 16:10:20 +08:00
WenhaiLin 553cf58312 Remove FileUtilsAndroid::purgeCachedEntries 2015-01-14 16:05:33 +08:00
Dale Stammen 5a4c6d75d8 clean up CC_USE_WEBP disabled for WP8 and WINRT 2015-01-13 14:37:22 -08:00
huangshiwu f4ac7c4e44 modify WP8 project and update precompileshader 2015-01-14 02:15:04 +08:00
Wenhai Lin 58c45ca144 Integrate CocosPlayClient 2015-01-13 17:30:07 +08:00
Satoshi SUZUKI b0d1dd2435 FileUtils::fullPathForFilename should return "" if resource is not found. 
I Think this method should return empty string when the resource is not found.
Because, I cannot check if the file found or not with current implementation.
 2015-01-10 19:30:42 +09:00
WenhaiLin 57cd4cd3c6 Fixed VideoPlayer can't play when passing the full path of video resource 2015-01-09 19:14:19 +08:00
WenhaiLin d92a525bfa Fixed dead loop when width of label[system font] smaller then one word of the string on android 2015-01-09 16:52:40 +08:00
Huabing.Xu b5859114b7 Merge pull request #9778 from samuele3hu/v3_4_bug_xmlhttp 
Fix crash on the XmlHttpRequestTest for Lua and parsing error of response headers for HttpURLConnection
 2015-01-07 17:45:43 +08:00
minggo 4c7377480b Merge pull request #9837 from minggo/memory-leak 
fix memory leak
 2015-01-07 17:23:28 +08:00
minggo 1dcdd81fc4 fix memory leak 2015-01-07 15:02:27 +08:00
Huabing.Xu 339a8b1abc class rename for EGLConfigChooser 2015-01-06 16:18:01 +08:00
Huabing.Xu 1180f7a41e move class cocos2dEGLConfigChooser to Cocos2dxActivity 2015-01-06 12:44:29 +08:00
minggo b88b9ea994 Merge pull request #9777 from ffskyfan/v3 
fix the problem that engine can't get data from file on windows
 2015-01-06 10:21:36 +08:00